diff options
| author | matthewjasper <mjjasper1@gmail.com> | 2017-04-22 17:55:59 +0100 |
|---|---|---|
| committer | matthewjasper <mjjasper1@gmail.com> | 2017-04-22 17:55:59 +0100 |
| commit | 8a3ea01bcae85a3ed0c90ca5603cd88c469172c3 (patch) | |
| tree | 291c7e740787ea95d87ac7a39f89a99d00b41c3c /src/libsyntax_ext | |
| parent | 5fc25224da78afcfdd76783c38ad3beff42a990c (diff) | |
| parent | 6d841da4a0d7629f826117f99052e3d4a7997a7e (diff) | |
| download | rust-8a3ea01bcae85a3ed0c90ca5603cd88c469172c3.tar.gz rust-8a3ea01bcae85a3ed0c90ca5603cd88c469172c3.zip | |
Resolve merge conflict
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index 1ff0fec1c96..e96883c26f3 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -773,7 +773,7 @@ fn find_repr_type_name(diagnostic: &Handler, type_attrs: &[ast::Attribute]) -> & for a in type_attrs { for r in &attr::find_repr_attrs(diagnostic, a) { repr_type_name = match *r { - attr::ReprPacked | attr::ReprSimd => continue, + attr::ReprPacked | attr::ReprSimd | attr::ReprAlign(_) => continue, attr::ReprExtern => "i32", attr::ReprInt(attr::SignedInt(ast::IntTy::Is)) => "isize", |