Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark attributes consumed by check_mod_attrs as normal #69412

Merged
merged 1 commit into from
Feb 26, 2020
Merged

Mark attributes consumed by check_mod_attrs as normal #69412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/librustc_feature/builtin_attrs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
ungated!(export_name, Whitelisted, template!(NameValueStr: "name")),
ungated!(link_section, Whitelisted, template!(NameValueStr: "name")),
ungated!(no_mangle, Whitelisted, template!(Word)),
ungated!(used, Whitelisted, template!(Word)),
ungated!(used, Normal, template!(Word)),

// Limits:
ungated!(recursion_limit, CrateLevel, template!(NameValueStr: "N")),
Expand All @@ -250,17 +250,17 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
ungated!(path, Normal, template!(NameValueStr: "file")),
ungated!(no_std, CrateLevel, template!(Word)),
ungated!(no_implicit_prelude, Normal, template!(Word)),
ungated!(non_exhaustive, Whitelisted, template!(Word)),
ungated!(non_exhaustive, Normal, template!(Word)),

// Runtime
ungated!(windows_subsystem, Whitelisted, template!(NameValueStr: "windows|console")),
ungated!(panic_handler, Normal, template!(Word)), // RFC 2070

// Code generation:
ungated!(inline, Whitelisted, template!(Word, List: "always|never")),
ungated!(inline, Normal, template!(Word, List: "always|never")),
ungated!(cold, Whitelisted, template!(Word)),
ungated!(no_builtins, Whitelisted, template!(Word)),
ungated!(target_feature, Whitelisted, template!(List: r#"enable = "name""#)),
ungated!(target_feature, Normal, template!(List: r#"enable = "name""#)),
gated!(
no_sanitize, Whitelisted,
template!(List: "address, memory, thread"),
Expand All @@ -275,7 +275,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
// ==========================================================================

// Linking:
gated!(naked, Whitelisted, template!(Word), naked_functions, experimental!(naked)),
gated!(naked, Normal, template!(Word), naked_functions, experimental!(naked)),
gated!(
link_args, Normal, template!(NameValueStr: "args"),
"the `link_args` attribute is experimental and not portable across platforms, \
Expand Down Expand Up @@ -332,7 +332,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
),

gated!(ffi_returns_twice, Whitelisted, template!(Word), experimental!(ffi_returns_twice)),
gated!(track_caller, Whitelisted, template!(Word), experimental!(track_caller)),
gated!(track_caller, Normal, template!(Word), experimental!(track_caller)),
gated!(
register_attr, CrateLevel, template!(List: "attr1, attr2, ..."),
experimental!(register_attr),
Expand Down
13 changes: 13 additions & 0 deletions src/test/ui/unused/unused-attr-crate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#![deny(unused_attributes)]

#![feature(naked_functions)]
#![feature(track_caller)]

#![used] //~ ERROR unused attribute
#![non_exhaustive] //~ ERROR unused attribute
#![inline] //~ ERROR unused attribute
#![target_feature(enable = "")] //~ ERROR unused attribute
#![naked] //~ ERROR unused attribute
#![track_caller] //~ ERROR unused attribute

fn main() {}
44 changes: 44 additions & 0 deletions src/test/ui/unused/unused-attr-crate.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
error: unused attribute
--> $DIR/unused-attr-crate.rs:6:1
|
LL | #![used]
| ^^^^^^^^
|
note: the lint level is defined here
--> $DIR/unused-attr-crate.rs:1:9
|
LL | #![deny(unused_attributes)]
| ^^^^^^^^^^^^^^^^^

error: unused attribute
--> $DIR/unused-attr-crate.rs:7:1
|
LL | #![non_exhaustive]
| ^^^^^^^^^^^^^^^^^^

error: unused attribute
--> $DIR/unused-attr-crate.rs:8:1
|
LL | #![inline]
| ^^^^^^^^^^

error: unused attribute
--> $DIR/unused-attr-crate.rs:9:1
|
LL | #![target_feature(enable = "")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: unused attribute
--> $DIR/unused-attr-crate.rs:10:1
|
LL | #![naked]
| ^^^^^^^^^

error: unused attribute
--> $DIR/unused-attr-crate.rs:11:1
|
LL | #![track_caller]
| ^^^^^^^^^^^^^^^^

error: aborting due to 6 previous errors