diff options
| author | dylan_DPC <dylan.dpc@gmail.com> | 2019-01-04 23:03:36 +0530 |
|---|---|---|
| committer | dylan_DPC <dylan.dpc@gmail.com> | 2019-01-08 00:21:16 +0530 |
| commit | 6ddd2cdc5bc631218ff3e4317611a9a7dacdabde (patch) | |
| tree | 5d9f03b0b45cc7a0fd93f398ea8024d730a25ad5 /src | |
| parent | 64a17a0e599ec32252b96f7b5fa3d208ec7d77ef (diff) | |
| download | rust-6ddd2cdc5bc631218ff3e4317611a9a7dacdabde.tar.gz rust-6ddd2cdc5bc631218ff3e4317611a9a7dacdabde.zip | |
remove unwanted stage0 line, fix style
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/conditional-compilation/cfg-attr-parse.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/conditional-compilation/cfg-attr-parse.stderr | 10 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index c900bb916f4..cddec3eb23a 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -686,7 +686,7 @@ declare_features! ( (accepted, repr_packed, "1.33.0", Some(33158), None), // Allows calling `const unsafe fn` inside `unsafe` blocks in `const fn` functions. (accepted, min_const_unsafe_fn, "1.33.0", Some(55607), None), -// `#[cfg_attr(predicate, multiple, attributes, here)]` + // `#[cfg_attr(predicate, multiple, attributes, here)]` (accepted, cfg_attr_multi, "1.33.0", Some(54881), None), ); diff --git a/src/test/ui/conditional-compilation/cfg-attr-parse.rs b/src/test/ui/conditional-compilation/cfg-attr-parse.rs index 5e695375eba..93aef72220c 100644 --- a/src/test/ui/conditional-compilation/cfg-attr-parse.rs +++ b/src/test/ui/conditional-compilation/cfg-attr-parse.rs @@ -1,7 +1,5 @@ // Parse `cfg_attr` with varying numbers of attributes and trailing commas -#![cfg_attr(stage0, feature(cfg_attr_multi))] - // Completely empty `cfg_attr` input #[cfg_attr()] //~ error: expected identifier, found `)` struct NoConfigurationPredicate; diff --git a/src/test/ui/conditional-compilation/cfg-attr-parse.stderr b/src/test/ui/conditional-compilation/cfg-attr-parse.stderr index 553406b6dd8..36c7c817cb3 100644 --- a/src/test/ui/conditional-compilation/cfg-attr-parse.stderr +++ b/src/test/ui/conditional-compilation/cfg-attr-parse.stderr @@ -1,29 +1,29 @@ error: expected identifier, found `)` - --> $DIR/cfg-attr-parse.rs:6:12 + --> $DIR/cfg-attr-parse.rs:4:12 | LL | #[cfg_attr()] //~ error: expected identifier, found `)` | ^ expected identifier error: expected `,`, found `)` - --> $DIR/cfg-attr-parse.rs:10:17 + --> $DIR/cfg-attr-parse.rs:8:17 | LL | #[cfg_attr(all())] //~ error: expected `,`, found `)` | ^ expected `,` error: expected identifier, found `,` - --> $DIR/cfg-attr-parse.rs:18:18 + --> $DIR/cfg-attr-parse.rs:16:18 | LL | #[cfg_attr(all(),,)] //~ ERROR expected identifier | ^ expected identifier error: expected identifier, found `,` - --> $DIR/cfg-attr-parse.rs:30:28 + --> $DIR/cfg-attr-parse.rs:28:28 | LL | #[cfg_attr(all(), must_use,,)] //~ ERROR expected identifier | ^ expected identifier error: expected identifier, found `,` - --> $DIR/cfg-attr-parse.rs:42:40 + --> $DIR/cfg-attr-parse.rs:40:40 | LL | #[cfg_attr(all(), must_use, deprecated,,)] //~ ERROR expected identifier | ^ expected identifier |