From 7a3704c50044a0e9d611a264daeabbf47d398474 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Tue, 27 Sep 2016 19:06:44 +0300 Subject: Fix rebase fallout This commit includes manual merge conflict resolution changes from a rebase by @est31. --- src/libsyntax_ext/deriving/generic/mod.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libsyntax_ext') 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", } } -- cgit 1.4.1-3-g733a5