diff options
| author | bors <bors@rust-lang.org> | 2018-01-09 04:22:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-09 04:22:50 +0000 |
| commit | 74966b5cb84934737d21bd9001db07bd93fa5d64 (patch) | |
| tree | 91adae4383a3e9a5dcbd68543a78ef9adcda5b29 /src/libsyntax_ext | |
| parent | b5392f54503fdaf04df4b9578510b2baa944f4af (diff) | |
| parent | 9ef98545c9d55e109242b6b3489060ebc690ab05 (diff) | |
| download | rust-74966b5cb84934737d21bd9001db07bd93fa5d64.tar.gz rust-74966b5cb84934737d21bd9001db07bd93fa5d64.zip | |
Auto merge of #47276 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests - Successful merges: #47210, #47233, #47246, #47254, #47256, #47258, #47259, #47263, #47270, #47272 - Failed merges: #47248
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 48872cb1313..08a7f85d14b 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -831,7 +831,7 @@ fn find_repr_type_name(diagnostic: &Handler, type_attrs: &[ast::Attribute]) -> & for r in &attr::find_repr_attrs(diagnostic, a) { repr_type_name = match *r { attr::ReprPacked | attr::ReprSimd | attr::ReprAlign(_) => continue, - attr::ReprExtern => "i32", + attr::ReprC => "i32", attr::ReprInt(attr::SignedInt(ast::IntTy::Isize)) => "isize", attr::ReprInt(attr::SignedInt(ast::IntTy::I8)) => "i8", |