diff options
| author | Simonas Kazlauskas <git@kazlauskas.me> | 2016-09-27 19:06:44 +0300 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2016-12-30 15:17:27 +0100 |
| commit | 7a3704c50044a0e9d611a264daeabbf47d398474 (patch) | |
| tree | 15ae27e2975d19e8d7e2b13185ad2149c5c5f23b /src/libsyntax_ext | |
| parent | bfa53cfb76e6e23c8f0380132ceef5008add8ccb (diff) | |
| download | rust-7a3704c50044a0e9d611a264daeabbf47d398474.tar.gz rust-7a3704c50044a0e9d611a264daeabbf47d398474.zip | |
Fix rebase fallout
This commit includes manual merge conflict resolution changes from a rebase by @est31.
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index 114bf437cfd..0d2f4eaaffd 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -788,6 +788,7 @@ fn find_repr_type_name(diagnostic: &Handler, type_attrs: &[ast::Attribute]) -> & attr::ReprInt(attr::UnsignedInt(ast::UintTy::U8)) => "u8", attr::ReprInt(attr::UnsignedInt(ast::UintTy::U16)) => "u16", attr::ReprInt(attr::UnsignedInt(ast::UintTy::U32)) => "u32", + attr::ReprInt(attr::UnsignedInt(ast::UintTy::U64)) => "u64", attr::ReprInt(attr::UnsignedInt(ast::UintTy::U128)) => "u128", } } |