Skip to content

Commit 993bb07

Browse files
petrochenkovpetrochenkov
committed
rustc_expand: Mark inner #![test] attributes as soft-unstable
1 parent ae6aa22 commit 993bb07

File tree

8 files changed

+37
-21
lines changed

8 files changed

+37
-21
lines changed

‎compiler/rustc_resolve/src/macros.rs

+14-15
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use rustc_hir::def::{self, DefKind, NonMacroAttrKind};
2222
use rustc_hir::def_id;
2323
use rustc_middle::middle::stability;
2424
use rustc_middle::ty;
25-
use rustc_session::lint::builtin::UNUSED_MACROS;
25+
use rustc_session::lint::builtin::{SOFT_UNSTABLE, UNUSED_MACROS};
2626
use rustc_session::parse::feature_err;
2727
use rustc_session::Session;
2828
use rustc_span::edition::Edition;
@@ -459,22 +459,21 @@ impl<'a> Resolver<'a> {
459459
}
460460

461461
// We are trying to avoid reporting this error if other related errors were reported.
462-
if inner_attr
462+
if res != Res::Err
463+
&& inner_attr
463464
&& !self.session.features_untracked().custom_inner_attributes
464-
&& path != &sym::test
465-
&& res != Res::Err
466465
{
467-
feature_err(
468-
&self.session.parse_sess,
469-
sym::custom_inner_attributes,
470-
path.span,
471-
match res {
472-
Res::Def(..) => "inner macro attributes are unstable",
473-
Res::NonMacroAttr(..) => "custom inner attributes are unstable",
474-
_ => unreachable!(),
475-
},
476-
)
477-
.emit();
466+
let msg = match res {
467+
Res::Def(..) => "inner macro attributes are unstable",
468+
Res::NonMacroAttr(..) => "custom inner attributes are unstable",
469+
_ => unreachable!(),
470+
};
471+
if path == &sym::test {
472+
self.session.parse_sess.buffer_lint(SOFT_UNSTABLE, path.span, node_id, msg);
473+
} else {
474+
feature_err(&self.session.parse_sess, sym::custom_inner_attributes, path.span, msg)
475+
.emit();
476+
}
478477
}
479478

480479
Ok((ext, res))

‎library/std/src/num/tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ fn test_checked_mul() {
7575

7676
macro_rules! test_is_power_of_two {
7777
($test_name:ident, $T:ident) => {
78+
#[test]
7879
fn $test_name() {
79-
#![test]
8080
assert_eq!((0 as $T).is_power_of_two(), false);
8181
assert_eq!((1 as $T).is_power_of_two(), true);
8282
assert_eq!((2 as $T).is_power_of_two(), true);
@@ -96,8 +96,8 @@ test_is_power_of_two! { test_is_power_of_two_uint, usize }
9696

9797
macro_rules! test_next_power_of_two {
9898
($test_name:ident, $T:ident) => {
99+
#[test]
99100
fn $test_name() {
100-
#![test]
101101
assert_eq!((0 as $T).next_power_of_two(), 1);
102102
let mut next_power = 1;
103103
for i in 1 as $T..40 {
@@ -118,8 +118,8 @@ test_next_power_of_two! { test_next_power_of_two_uint, usize }
118118

119119
macro_rules! test_checked_next_power_of_two {
120120
($test_name:ident, $T:ident) => {
121+
#[test]
121122
fn $test_name() {
122-
#![test]
123123
assert_eq!((0 as $T).checked_next_power_of_two(), Some(1));
124124
let smax = $T::MAX >> 1;
125125
assert_eq!(smax.checked_next_power_of_two(), Some(smax + 1));

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

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// The non-crate level cases are in issue-43106-gating-of-builtin-attrs.rs.
22

3+
#![allow(soft_unstable)]
34
#![test = "4200"]
45
//~^ ERROR cannot determine resolution for the attribute macro `test`
56

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: cannot determine resolution for the attribute macro `test`
2-
--> $DIR/issue-43106-gating-of-test.rs:3:4
2+
--> $DIR/issue-43106-gating-of-test.rs:4:4
33
|
44
LL | #![test = "4200"]
55
| ^^^^

‎src/test/ui/issues/issue-28134.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
// compile-flags: --test
22

3+
#![allow(soft_unstable)]
34
#![test] //~ ERROR cannot determine resolution for the attribute macro `test`

‎src/test/ui/issues/issue-28134.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: cannot determine resolution for the attribute macro `test`
2-
--> $DIR/issue-28134.rs:3:4
2+
--> $DIR/issue-28134.rs:4:4
33
|
44
LL | #![test]
55
| ^^^^

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

+5
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,9 @@ fn attrs() {
4545
//~^ ERROR: custom attributes cannot be applied to expressions
4646
}
4747

48+
fn test_case() {
49+
#![test] //~ ERROR inner macro attributes are unstable
50+
//~| WARN this was previously accepted
51+
}
52+
4853
fn main() {}

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

+11-1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,16 @@ LL | let _x = #[identity_attr] println!();
7676
= note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
7777
= help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
7878

79-
error: aborting due to 9 previous errors
79+
error: inner macro attributes are unstable
80+
--> $DIR/proc-macro-gates.rs:49:8
81+
|
82+
LL | #![test]
83+
| ^^^^
84+
|
85+
= note: `#[deny(soft_unstable)]` on by default
86+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
87+
= note: for more information, see issue #64266 <https://github.com/rust-lang/rust/issues/64266>
88+
89+
error: aborting due to 10 previous errors
8090

8191
For more information about this error, try `rustc --explain E0658`.

0 commit comments

Comments
 (0)