nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 01:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #69513 - tmiasko:revert-checked-unused, r=petrochenkov

Browse Source 
Revert "Mark attributes consumed by `check_mod_attrs` as normal"

This reverts commit d78b22f35e.

Those changes were incompatible with incremental compilation since the
effect `check_mod_attrs` has with respect to marking the attributes as
used is neither persisted nor recomputed.
This commit is contained in:
bors 2020-02-27 23:04:51 +00:00
commit fbc46b7d71
3 changed files with 6 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/librustc_feature/builtin_attrs.rs
View File

@ -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, Normal, template!(Word)),
ungated!(used, Whitelisted, template!(Word)),
// Limits:
ungated!(recursion_limit, CrateLevel, template!(NameValueStr: "N")),
@ -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, Normal, template!(Word)),
ungated!(non_exhaustive, Whitelisted, template!(Word)),
// Runtime
ungated!(windows_subsystem, Whitelisted, template!(NameValueStr: "windows|console")),
ungated!(panic_handler, Normal, template!(Word)), // RFC 2070
// Code generation:
ungated!(inline, Normal, template!(Word, List: "always|never")),
ungated!(inline, Whitelisted, template!(Word, List: "always|never")),
ungated!(cold, Whitelisted, template!(Word)),
ungated!(no_builtins, Whitelisted, template!(Word)),
ungated!(target_feature, Normal, template!(List: r#"enable = "name""#)),
ungated!(target_feature, Whitelisted, template!(List: r#"enable = "name""#)),
gated!(
no_sanitize, Whitelisted,
template!(List: "address, memory, thread"),
@ -275,7 +275,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
// ==========================================================================
// Linking:
gated!(naked, Normal, template!(Word), naked_functions, experimental!(naked)),
gated!(naked, Whitelisted, template!(Word), naked_functions, experimental!(naked)),
gated!(
link_args, Normal, template!(NameValueStr: "args"),
"the `link_args` attribute is experimental and not portable across platforms, \
@ -332,7 +332,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
),
gated!(ffi_returns_twice, Whitelisted, template!(Word), experimental!(ffi_returns_twice)),
gated!(track_caller, Normal, template!(Word), experimental!(track_caller)),
gated!(track_caller, Whitelisted, template!(Word), experimental!(track_caller)),
gated!(
register_attr, CrateLevel, template!(List: "attr1, attr2, ..."),
experimental!(register_attr),

13
src/test/ui/unused/unused-attr-crate.rs
View File

@ -1,13 +0,0 @@
#![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
src/test/ui/unused/unused-attr-crate.stderr
View File

@ -1,44 +0,0 @@
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