Skip to content

Commit eccc199

Browse files
petrochenkovpetrochenkov
committed
Stabilize unrestricted_attribute_tokens 
1 parent 8e1b5d8 commit eccc199

16 files changed

+26
-74
lines changed

‎src/libcore/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@
123123
#![feature(abi_unadjusted)]
124124
#![feature(adx_target_feature)]
125125
#![feature(maybe_uninit, maybe_uninit_slice, maybe_uninit_array)]
126-
#![feature(unrestricted_attribute_tokens)]
127126
#![feature(external_doc)]
128127

129128
#[prelude_import]

‎src/libsyntax/feature_gate.rs

+7-11
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ use crate::early_buffered_lints::BufferedEarlyLintId;
2121
use crate::source_map::Spanned;
2222
use crate::edition::{ALL_EDITIONS, Edition};
2323
use crate::visit::{self, FnKind, Visitor};
24-
use crate::parse::ParseSess;
24+
use crate::parse::{token, ParseSess};
2525
use crate::symbol::Symbol;
26+
use crate::tokenstream::TokenTree;
2627

2728
use errors::{DiagnosticBuilder, Handler};
2829
use rustc_data_structures::fx::FxHashMap;
@@ -431,9 +432,6 @@ declare_features! (
431432
// Added for testing E0705; perma-unstable.
432433
(active, test_2018_feature, "1.31.0", Some(0), Some(Edition::Edition2018)),
433434

434-
// support for arbitrary delimited token streams in non-macro attributes
435-
(active, unrestricted_attribute_tokens, "1.30.0", Some(55208), None),
436-
437435
// Allows unsized rvalues at arguments and parameters.
438436
(active, unsized_locals, "1.30.0", Some(48055), None),
439437

@@ -700,6 +698,8 @@ declare_features! (
700698
(accepted, cfg_target_vendor, "1.33.0", Some(29718), None),
701699
// `extern crate self as foo;` puts local crate root into extern prelude under name `foo`.
702700
(accepted, extern_crate_self, "1.34.0", Some(56409), None),
701+
// support for arbitrary delimited token streams in non-macro attributes
702+
(accepted, unrestricted_attribute_tokens, "1.34.0", Some(55208), None),
703703
);
704704

705705
// If you change this, please modify `src/doc/unstable-book` as well. You must
@@ -1660,13 +1660,9 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
16601660

16611661
match BUILTIN_ATTRIBUTES.iter().find(|(name, ..)| attr.path == name) {
16621662
Some(&(name, _, template, _)) => self.check_builtin_attribute(attr, name, template),
1663-
None => if !self.context.features.unrestricted_attribute_tokens {
1664-
// Unfortunately, `parse_meta` cannot be called speculatively
1665-
// because it can report errors by itself, so we have to call it
1666-
// only if the feature is disabled.
1667-
if let Err(mut err) = attr.parse_meta(self.context.parse_sess) {
1668-
err.help("try enabling `#![feature(unrestricted_attribute_tokens)]`").emit()
1669-
}
1663+
None => if let Some(TokenTree::Token(_, token::Eq)) = attr.tokens.trees().next() {
1664+
// All key-value attributes are restricted to meta-item syntax.
1665+
attr.parse_meta(self.context.parse_sess).map_err(|mut err| err.emit()).ok();
16701666
}
16711667
}
16721668
}

‎src/test/run-pass/proc-macro/derive-b.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// aux-build:derive-b.rs
22

3-
#![feature(unrestricted_attribute_tokens)]
4-
53
extern crate derive_b;
64

75
#[derive(Debug, PartialEq, derive_b::B, Eq, Copy, Clone)]

‎src/test/ui/attr-eq-token-tree.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(custom_attribute, unrestricted_attribute_tokens)]
1+
#![feature(custom_attribute)]
22

33
#[my_attr = !] //~ ERROR unexpected token: `!`
44
fn main() {}

‎src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.rs

-7
This file was deleted.

‎src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.stderr

-20
This file was deleted.

‎src/test/ui/macros/macro-attribute.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
#![feature(unrestricted_attribute_tokens)]
2-
31
#[doc = $not_there] //~ ERROR unexpected token: `$`
42
fn main() { }

‎src/test/ui/macros/macro-attribute.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: unexpected token: `$`
2-
--> $DIR/macro-attribute.rs:3:7
2+
--> $DIR/macro-attribute.rs:1:7
33
|
44
LL | #[doc = $not_there] //~ ERROR unexpected token: `$`
55
| ^

‎src/test/ui/malformed/malformed-interpolated.stderr

-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ LL | #[my_attr = $expr] //~ ERROR suffixed literals are not allowed in a
1717
...
1818
LL | check!(-0); // ERROR, see above
1919
| ----------- in this macro invocation
20-
|
21-
= help: try enabling `#![feature(unrestricted_attribute_tokens)]`
2220

2321
error: unexpected token: `0 + 0`
2422
--> $DIR/malformed-interpolated.rs:5:19
@@ -28,8 +26,6 @@ LL | #[my_attr = $expr] //~ ERROR suffixed literals are not allowed in a
2826
...
2927
LL | check!(0 + 0); // ERROR, see above
3028
| -------------- in this macro invocation
31-
|
32-
= help: try enabling `#![feature(unrestricted_attribute_tokens)]`
3329

3430
error: aborting due to 3 previous errors
3531

‎src/test/ui/marker_trait_attr/marker-attribute-with-values.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![feature(marker_trait_attr)]
2-
#![feature(unrestricted_attribute_tokens)]
32

43
#[marker(always)]
54
trait Marker1 {}
@@ -9,8 +8,8 @@ trait Marker1 {}
98
trait Marker2 {}
109
//~^^ ERROR attribute must be of the form
1110

12-
#[marker(key = value)]
11+
#[marker(key = "value")]
1312
trait Marker3 {}
14-
//~^^ ERROR expected unsuffixed literal or identifier, found value
13+
//~^^ ERROR attribute must be of the form `#[marker]`
1514

1615
fn main() {}

‎src/test/ui/marker_trait_attr/marker-attribute-with-values.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
error: attribute must be of the form `#[marker]`
2-
--> $DIR/marker-attribute-with-values.rs:4:1
2+
--> $DIR/marker-attribute-with-values.rs:3:1
33
|
44
LL | #[marker(always)]
55
| ^^^^^^^^^^^^^^^^^
66

77
error: attribute must be of the form `#[marker]`
8-
--> $DIR/marker-attribute-with-values.rs:8:1
8+
--> $DIR/marker-attribute-with-values.rs:7:1
99
|
1010
LL | #[marker("never")]
1111
| ^^^^^^^^^^^^^^^^^^
1212

13-
error: expected unsuffixed literal or identifier, found value
14-
--> $DIR/marker-attribute-with-values.rs:12:10
13+
error: attribute must be of the form `#[marker]`
14+
--> $DIR/marker-attribute-with-values.rs:11:1
1515
|
16-
LL | #[marker(key = value)]
17-
| ^^^
16+
LL | #[marker(key = "value")]
17+
| ^^^^^^^^^^^^^^^^^^^^^^^^
1818

1919
error: aborting due to 3 previous errors
2020

‎src/test/ui/parser/attr-bad-meta.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
#![feature(unrestricted_attribute_tokens)]
2-
31
#[path*] //~ ERROR expected one of `(`, `::`, `=`, `[`, `]`, or `{`, found `*`
42
mod m {}

‎src/test/ui/parser/attr-bad-meta.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: expected one of `(`, `::`, `=`, `[`, `]`, or `{`, found `*`
2-
--> $DIR/attr-bad-meta.rs:3:7
2+
--> $DIR/attr-bad-meta.rs:1:7
33
|
44
LL | #[path*] //~ ERROR expected one of `(`, `::`, `=`, `[`, `]`, or `{`, found `*`
55
| ^ expected one of `(`, `::`, `=`, `[`, `]`, or `{` here

‎src/test/ui/proc-macro/proc-macro-attributes.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ extern crate derive_b;
88
#[B(D)] //~ ERROR `B` is ambiguous
99
#[B(E = "foo")] //~ ERROR `B` is ambiguous
1010
#[B(arbitrary tokens)] //~ ERROR `B` is ambiguous
11-
//~^ ERROR expected one of `(`, `)`, `,`, `::`, or `=`, found `tokens`
1211
#[derive(B)]
1312
struct B;
1413

‎src/test/ui/proc-macro/proc-macro-attributes.stderr

+5-11
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LL | #[B] //~ ERROR `B` is ambiguous
1313
| ^ ambiguous name
1414
|
1515
note: `B` could refer to the derive helper attribute defined here
16-
--> $DIR/proc-macro-attributes.rs:12:10
16+
--> $DIR/proc-macro-attributes.rs:11:10
1717
|
1818
LL | #[derive(B)]
1919
| ^
@@ -30,7 +30,7 @@ LL | #[B(D)] //~ ERROR `B` is ambiguous
3030
| ^ ambiguous name
3131
|
3232
note: `B` could refer to the derive helper attribute defined here
33-
--> $DIR/proc-macro-attributes.rs:12:10
33+
--> $DIR/proc-macro-attributes.rs:11:10
3434
|
3535
LL | #[derive(B)]
3636
| ^
@@ -47,7 +47,7 @@ LL | #[B(E = "foo")] //~ ERROR `B` is ambiguous
4747
| ^ ambiguous name
4848
|
4949
note: `B` could refer to the derive helper attribute defined here
50-
--> $DIR/proc-macro-attributes.rs:12:10
50+
--> $DIR/proc-macro-attributes.rs:11:10
5151
|
5252
LL | #[derive(B)]
5353
| ^
@@ -64,7 +64,7 @@ LL | #[B(arbitrary tokens)] //~ ERROR `B` is ambiguous
6464
| ^ ambiguous name
6565
|
6666
note: `B` could refer to the derive helper attribute defined here
67-
--> $DIR/proc-macro-attributes.rs:12:10
67+
--> $DIR/proc-macro-attributes.rs:11:10
6868
|
6969
LL | #[derive(B)]
7070
| ^
@@ -74,13 +74,7 @@ note: `B` could also refer to the derive macro imported here
7474
LL | #[macro_use]
7575
| ^^^^^^^^^^^^
7676

77-
error: expected one of `(`, `)`, `,`, `::`, or `=`, found `tokens`
78-
--> $DIR/proc-macro-attributes.rs:10:15
79-
|
80-
LL | #[B(arbitrary tokens)] //~ ERROR `B` is ambiguous
81-
| ^^^^^^ expected one of `(`, `)`, `,`, `::`, or `=` here
82-
83-
error: aborting due to 6 previous errors
77+
error: aborting due to 5 previous errors
8478

8579
Some errors occurred: E0658, E0659.
8680
For more information about an error, try `rustc --explain E0658`.

‎src/test/ui/unrestricted-attribute-tokens.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// compile-pass
22

3-
#![feature(custom_attribute, unrestricted_attribute_tokens)]
3+
#![feature(custom_attribute)]
44

55
#[my_attr(a b c d)]
6+
#[my_attr[a b c d]]
7+
#[my_attr{a b c d}]
68
fn main() {}

0 commit comments

Comments
 (0)