diff options
| author | bors <bors@rust-lang.org> | 2018-01-22 08:10:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-22 08:10:41 +0000 |
| commit | b887317da6ba0f70b34c0439ade8508e1b525fb0 (patch) | |
| tree | ce6ba8d360d4f6026f495694b15b31e4b9f86179 /src/libsyntax_ext | |
| parent | bc072ed0ca8e2e9f8c79fb04e85b47b5c0e8d6ae (diff) | |
| parent | 2be697bc215f19b4bf17df6b9b56626ab7b1d994 (diff) | |
| download | rust-b887317da6ba0f70b34c0439ade8508e1b525fb0.tar.gz rust-b887317da6ba0f70b34c0439ade8508e1b525fb0.zip | |
Auto merge of #47158 - rkruppe:repr-transparent, r=eddyb
Implement repr(transparent) r? @eddyb for the functional changes. The bulk of the PR is error messages and docs, might be good to have a doc person look over those. cc #43036 cc @nox
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index 08a7f85d14b..3660d2fe46a 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -830,7 +830,9 @@ 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 | attr::ReprAlign(_) => continue, + attr::ReprPacked | attr::ReprSimd | attr::ReprAlign(_) | attr::ReprTransparent => + continue, + attr::ReprC => "i32", attr::ReprInt(attr::SignedInt(ast::IntTy::Isize)) => "isize", |