Skip to content

Commit d3411d3

Browse files
petrochenkovpetrochenkov
committedJan 13, 2019
Address review comments
·
1.86.01.34.0
1 parent 41c6599 commit d3411d3

File tree

5 files changed

+20
-13
lines changed

5 files changed

+20
-13
lines changed
 

‎src/librustc_lint/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
338338
},
339339
FutureIncompatibleInfo {
340340
id: LintId::of(ILL_FORMED_ATTRIBUTE_INPUT),
341-
reference: "issue #57321 <https://github.com/rust-lang/rust/issues/57321>",
341+
reference: "issue #57571 <https://github.com/rust-lang/rust/issues/57571>",
342342
edition: None,
343343
},
344344
]);

‎src/libsyntax/feature_gate.rs

+11-4
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,8 @@ pub enum AttributeGate {
717717
Ungated,
718718
}
719719

720+
/// A template that the attribute input must match.
721+
/// Only top-level shape (`#[attr]` vs `#[attr(...)]` vs `#[attr = ...]`) is considered now.
720722
#[derive(Clone, Copy)]
721723
pub struct AttributeTemplate {
722724
word: bool,
@@ -725,6 +727,7 @@ pub struct AttributeTemplate {
725727
}
726728

727729
impl AttributeTemplate {
730+
/// Check that the given meta-item is compatible with this template.
728731
fn compatible(&self, meta_item_kind: &ast::MetaItemKind) -> bool {
729732
match meta_item_kind {
730733
ast::MetaItemKind::Word => self.word,
@@ -735,10 +738,10 @@ impl AttributeTemplate {
735738
}
736739
}
737740

741+
/// A convenience macro for constructing attribute templates.
742+
/// E.g. `template!(Word, List: "description")` means that the attribute
743+
/// supports forms `#[attr]` and `#[attr(description)]`.
738744
macro_rules! template {
739-
(@ $word: expr, $list: expr, $name_value_str: expr) => { AttributeTemplate {
740-
word: $word, list: $list, name_value_str: $name_value_str
741-
} };
742745
(Word) => { template!(@ true, None, None) };
743746
(List: $descr: expr) => { template!(@ false, Some($descr), None) };
744747
(NameValueStr: $descr: expr) => { template!(@ false, None, Some($descr)) };
@@ -750,6 +753,9 @@ macro_rules! template {
750753
(Word, List: $descr1: expr, NameValueStr: $descr2: expr) => {
751754
template!(@ true, Some($descr1), Some($descr2))
752755
};
756+
(@ $word: expr, $list: expr, $name_value_str: expr) => { AttributeTemplate {
757+
word: $word, list: $list, name_value_str: $name_value_str
758+
} };
753759
}
754760

755761
impl AttributeGate {
@@ -1084,7 +1090,8 @@ pub const BUILTIN_ATTRIBUTES: &[(&str, AttributeType, AttributeTemplate, Attribu
10841090
is an experimental feature",
10851091
cfg_fn!(fundamental))),
10861092

1087-
("proc_macro_derive", Normal, template!(List: "TraitName, attributes(name1, name2, ...)"),
1093+
("proc_macro_derive", Normal, template!(List: "TraitName, \
1094+
/*opt*/ attributes(name1, name2, ...)"),
10881095
Ungated),
10891096

10901097
("rustc_copy_clone_marker", Whitelisted, template!(Word), Gated(Stability::Unstable,

‎src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | #[inline = "2100"] fn f() { }
66
|
77
= note: #[warn(ill_formed_attribute_input)] on by default
88
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
9-
= note: for more information, see issue #57321 <https://github.com/rust-lang/rust/issues/57321>
9+
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
1010

1111
error[E0518]: attribute should be applied to function or closure
1212
--> $DIR/issue-43106-gating-of-inline.rs:11:1

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | #[doc] //~ WARN attribute must be of the form
66
|
77
= note: #[warn(ill_formed_attribute_input)] on by default
88
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
9-
= note: for more information, see issue #57321 <https://github.com/rust-lang/rust/issues/57321>
9+
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
1010

1111
warning: attribute must be of the form `#[ignore]` or `#[ignore = "reason"]`
1212
--> $DIR/malformed-regressions.rs:4:1
@@ -15,7 +15,7 @@ LL | #[ignore()] //~ WARN attribute must be of the form
1515
| ^^^^^^^^^^^
1616
|
1717
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
18-
= note: for more information, see issue #57321 <https://github.com/rust-lang/rust/issues/57321>
18+
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
1919

2020
warning: attribute must be of the form `#[inline]` or `#[inline(always|never)]`
2121
--> $DIR/malformed-regressions.rs:5:1
@@ -24,7 +24,7 @@ LL | #[inline = ""] //~ WARN attribute must be of the form
2424
| ^^^^^^^^^^^^^^
2525
|
2626
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
27-
= note: for more information, see issue #57321 <https://github.com/rust-lang/rust/issues/57321>
27+
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
2828

2929
warning: attribute must be of the form `#[link(name = "...", /*opt*/ kind = "dylib|static|...",
3030
/*opt*/ cfg = "...")]`
@@ -34,7 +34,7 @@ LL | #[link] //~ WARN attribute must be of the form
3434
| ^^^^^^^
3535
|
3636
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
37-
= note: for more information, see issue #57321 <https://github.com/rust-lang/rust/issues/57321>
37+
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
3838

3939
warning: attribute must be of the form `#[link(name = "...", /*opt*/ kind = "dylib|static|...",
4040
/*opt*/ cfg = "...")]`
@@ -44,5 +44,5 @@ LL | #[link = ""] //~ WARN attribute must be of the form
4444
| ^^^^^^^^^^^^
4545
|
4646
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
47-
= note: for more information, see issue #57321 <https://github.com/rust-lang/rust/issues/57321>
47+
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
4848

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ error: attribute must have either one or two arguments
3434
LL | #[proc_macro_derive(l, attributes(m), n)]
3535
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3636

37-
error: attribute must be of the form `#[proc_macro_derive(TraitName, attributes(name1, name2, ...))]`
37+
error: attribute must be of the form `#[proc_macro_derive(TraitName, /*opt*/ attributes(name1, name2, ...))]`
3838
--> $DIR/attribute.rs:8:1
3939
|
4040
LL | #[proc_macro_derive]
4141
| ^^^^^^^^^^^^^^^^^^^^
4242

43-
error: attribute must be of the form `#[proc_macro_derive(TraitName, attributes(name1, name2, ...))]`
43+
error: attribute must be of the form `#[proc_macro_derive(TraitName, /*opt*/ attributes(name1, name2, ...))]`
4444
--> $DIR/attribute.rs:14:1
4545
|
4646
LL | #[proc_macro_derive = "foo"]

0 commit comments

Comments
 (0)
Please sign in to comment.