diff options
| author | bors <bors@rust-lang.org> | 2019-11-19 07:49:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-19 07:49:54 +0000 |
| commit | 2cad8bb659066b42fc518c95def384956126bd3f (patch) | |
| tree | 6e4528f58f0e26bd7c8346df3ecfb80de4b1eb1c | |
| parent | d1da8023dafd3e277b5a4c5475aa2cb199a176b9 (diff) | |
| parent | 3fa8692a5e5f69133464dabb52f549a46529ffe6 (diff) | |
| download | rust-2cad8bb659066b42fc518c95def384956126bd3f.tar.gz rust-2cad8bb659066b42fc518c95def384956126bd3f.zip | |
Auto merge of #66206 - PotHix:master, r=estebank
Suggest `#[repr(C)]` instead of `#[repr(C, packed, ...)]` The code was previously suggesting `#[repr(C, packed, ...)]` for incorrect uses of `repr` (e.g. `#[repr = "C"]`). This change suggests the usage of `#[repr(C)]` instead. r? @estebank Ref: #61286.
| -rw-r--r-- | src/libsyntax/feature_gate/builtin_attrs.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-43988.stderr | 4 | ||||
| -rw-r--r-- | src/test/ui/repr.stderr | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax/feature_gate/builtin_attrs.rs b/src/libsyntax/feature_gate/builtin_attrs.rs index 555c715771a..57dae23f0dc 100644 --- a/src/libsyntax/feature_gate/builtin_attrs.rs +++ b/src/libsyntax/feature_gate/builtin_attrs.rs @@ -231,7 +231,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[ ), ungated!(link_name, Whitelisted, template!(NameValueStr: "name")), ungated!(no_link, Normal, template!(Word)), - ungated!(repr, Normal, template!(List: "C, packed, ...")), + ungated!(repr, Normal, template!(List: "C")), ungated!(export_name, Whitelisted, template!(NameValueStr: "name")), ungated!(link_section, Whitelisted, template!(NameValueStr: "name")), ungated!(no_mangle, Whitelisted, template!(Word)), diff --git a/src/test/ui/issues/issue-43988.stderr b/src/test/ui/issues/issue-43988.stderr index 339c1a3b8f6..37e56168c1d 100644 --- a/src/test/ui/issues/issue-43988.stderr +++ b/src/test/ui/issues/issue-43988.stderr @@ -2,13 +2,13 @@ error: malformed `repr` attribute input --> $DIR/issue-43988.rs:24:5 | LL | #[repr] - | ^^^^^^^ help: must be of the form: `#[repr(C, packed, ...)]` + | ^^^^^^^ help: must be of the form: `#[repr(C)]` error: malformed `repr` attribute input --> $DIR/issue-43988.rs:35:14 | LL | let _z = #[repr] 1; - | ^^^^^^^ help: must be of the form: `#[repr(C, packed, ...)]` + | ^^^^^^^ help: must be of the form: `#[repr(C)]` error[E0518]: attribute should be applied to function or closure --> $DIR/issue-43988.rs:5:5 diff --git a/src/test/ui/repr.stderr b/src/test/ui/repr.stderr index e756510a437..e0bec666381 100644 --- a/src/test/ui/repr.stderr +++ b/src/test/ui/repr.stderr @@ -2,19 +2,19 @@ error: malformed `repr` attribute input --> $DIR/repr.rs:1:1 | LL | #[repr] - | ^^^^^^^ help: must be of the form: `#[repr(C, packed, ...)]` + | ^^^^^^^ help: must be of the form: `#[repr(C)]` error: malformed `repr` attribute input --> $DIR/repr.rs:4:1 | LL | #[repr = "B"] - | ^^^^^^^^^^^^^ help: must be of the form: `#[repr(C, packed, ...)]` + | ^^^^^^^^^^^^^ help: must be of the form: `#[repr(C)]` error: malformed `repr` attribute input --> $DIR/repr.rs:7:1 | LL | #[repr = "C"] - | ^^^^^^^^^^^^^ help: must be of the form: `#[repr(C, packed, ...)]` + | ^^^^^^^^^^^^^ help: must be of the form: `#[repr(C)]` error: aborting due to 3 previous errors |