Skip to content

Commit cbfd873

Browse files
Aaron1011Aaron1011
committed
Make all proc-macro back-compat lints deny-by-default
The affected crates have had plenty of time to update. By keeping these as lints rather than making them hard errors, we ensure that downstream crates will still be able to compile, even if they transitive depend on broken versions of the affected crates. This should hopefully discourage anyone from writing any new code which relies on the backwards-compatibility behavior.
1 parent 8007b50 commit cbfd873

9 files changed

+77
-79
lines changed

‎compiler/rustc_lint_defs/src/builtin.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1918,7 +1918,7 @@ declare_lint! {
19181918
/// [issue #50504]: https://github.com/rust-lang/rust/issues/50504
19191919
/// [future-incompatible]: ../index.md#future-incompatible-lints
19201920
pub PROC_MACRO_DERIVE_RESOLUTION_FALLBACK,
1921-
Warn,
1921+
Deny,
19221922
"detects proc macro derives using inaccessible names from parent modules",
19231923
@future_incompatible = FutureIncompatibleInfo {
19241924
reference: "issue #83583 <https://github.com/rust-lang/rust/issues/83583>",
@@ -3239,7 +3239,7 @@ declare_lint! {
32393239
/// [issue #83125]: https://github.com/rust-lang/rust/issues/83125
32403240
/// [future-incompatible]: ../index.md#future-incompatible-lints
32413241
pub PROC_MACRO_BACK_COMPAT,
3242-
Warn,
3242+
Deny,
32433243
"detects usage of old versions of certain proc-macro crates",
32443244
@future_incompatible = FutureIncompatibleInfo {
32453245
reference: "issue #83125 <https://github.com/rust-lang/rust/issues/83125>",

‎src/test/ui/proc-macro/generate-mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ generate_mod::check!(); //~ ERROR cannot find type `FromOutside` in this scope
1313
//~| ERROR cannot find type `OuterAttr` in this scope
1414
struct S;
1515

16-
#[derive(generate_mod::CheckDerive)] //~ WARN cannot find type `FromOutside` in this scope
17-
//~| WARN cannot find type `OuterDerive` in this scope
16+
#[derive(generate_mod::CheckDerive)] //~ ERROR cannot find type `FromOutside` in this scope
17+
//~| ERROR cannot find type `OuterDerive` in this scope
1818
//~| WARN this was previously accepted
1919
//~| WARN this was previously accepted
2020
struct Z;
2121

2222
fn inner_block() {
23-
#[derive(generate_mod::CheckDerive)] //~ WARN cannot find type `FromOutside` in this scope
24-
//~| WARN cannot find type `OuterDerive` in this scope
23+
#[derive(generate_mod::CheckDerive)] //~ ERROR cannot find type `FromOutside` in this scope
24+
//~| ERROR cannot find type `OuterDerive` in this scope
2525
//~| WARN this was previously accepted
2626
//~| WARN this was previously accepted
2727
struct InnerZ;

‎src/test/ui/proc-macro/generate-mod.stderr

+10-10
Original file line numberDiff line numberDiff line change
@@ -38,47 +38,47 @@ LL | #[generate_mod::check_attr]
3838
OuterAttr
3939
= note: this error originates in the attribute macro `generate_mod::check_attr` (in Nightly builds, run with -Z macro-backtrace for more info)
4040

41-
warning: cannot find type `FromOutside` in this scope
41+
error: cannot find type `FromOutside` in this scope
4242
--> $DIR/generate-mod.rs:16:10
4343
|
4444
LL | #[derive(generate_mod::CheckDerive)]
4545
| ^^^^^^^^^^^^^^^^^^^^^^^^^ names from parent modules are not accessible without an explicit import
4646
|
47-
= note: `#[warn(proc_macro_derive_resolution_fallback)]` on by default
47+
= note: `#[deny(proc_macro_derive_resolution_fallback)]` on by default
4848
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
4949
= note: for more information, see issue #83583 <https://github.com/rust-lang/rust/issues/83583>
50-
= note: this warning originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
50+
= note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
5151

52-
warning: cannot find type `OuterDerive` in this scope
52+
error: cannot find type `OuterDerive` in this scope
5353
--> $DIR/generate-mod.rs:16:10
5454
|
5555
LL | #[derive(generate_mod::CheckDerive)]
5656
| ^^^^^^^^^^^^^^^^^^^^^^^^^ names from parent modules are not accessible without an explicit import
5757
|
5858
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
5959
= note: for more information, see issue #83583 <https://github.com/rust-lang/rust/issues/83583>
60-
= note: this warning originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
60+
= note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
6161

62-
warning: cannot find type `FromOutside` in this scope
62+
error: cannot find type `FromOutside` in this scope
6363
--> $DIR/generate-mod.rs:23:14
6464
|
6565
LL | #[derive(generate_mod::CheckDerive)]
6666
| ^^^^^^^^^^^^^^^^^^^^^^^^^ names from parent modules are not accessible without an explicit import
6767
|
6868
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
6969
= note: for more information, see issue #83583 <https://github.com/rust-lang/rust/issues/83583>
70-
= note: this warning originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
70+
= note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
7171

72-
warning: cannot find type `OuterDerive` in this scope
72+
error: cannot find type `OuterDerive` in this scope
7373
--> $DIR/generate-mod.rs:23:14
7474
|
7575
LL | #[derive(generate_mod::CheckDerive)]
7676
| ^^^^^^^^^^^^^^^^^^^^^^^^^ names from parent modules are not accessible without an explicit import
7777
|
7878
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
7979
= note: for more information, see issue #83583 <https://github.com/rust-lang/rust/issues/83583>
80-
= note: this warning originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
80+
= note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
8181

82-
error: aborting due to 4 previous errors; 4 warnings emitted
82+
error: aborting due to 8 previous errors
8383

8484
For more information about this error, try `rustc --explain E0412`.

‎src/test/ui/proc-macro/group-compat-hack/group-compat-hack.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// check-pass
21
// aux-build:pin-project-internal-0.4.0.rs
32
// compile-flags: -Z span-debug
43

@@ -24,7 +23,7 @@ mod no_version {
2423
}
2524

2625
struct Foo;
27-
impl_macros!(Foo); //~ WARN using an old version
26+
impl_macros!(Foo); //~ ERROR using an old version
2827
//~| WARN this was previously
2928
arrays!(Foo);
3029
other!(Foo);
@@ -41,9 +40,9 @@ mod with_version {
4140
}
4241

4342
struct Foo;
44-
impl_macros!(Foo); //~ WARN using an old version
43+
impl_macros!(Foo); //~ ERROR using an old version
4544
//~| WARN this was previously
46-
arrays!(Foo); //~ WARN using an old version
45+
arrays!(Foo); //~ ERROR using an old version
4746
//~| WARN this was previously
4847
other!(Foo);
4948
}
@@ -52,15 +51,15 @@ mod actix_web_test {
5251
include!("actix-web/src/extract.rs");
5352

5453
struct Foo;
55-
tuple_from_req!(Foo); //~ WARN using an old version
54+
tuple_from_req!(Foo); //~ ERROR using an old version
5655
//~| WARN this was previously
5756
}
5857

5958
mod actix_web_version_test {
6059
include!("actix-web-2.0.0/src/extract.rs");
6160

6261
struct Foo;
63-
tuple_from_req!(Foo); //~ WARN using an old version
62+
tuple_from_req!(Foo); //~ ERROR using an old version
6463
//~| WARN this was previously
6564
}
6665

‎src/test/ui/proc-macro/group-compat-hack/group-compat-hack.stderr

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,169 +1,169 @@
1-
warning: using an old version of `time-macros-impl`
1+
error: using an old version of `time-macros-impl`
22
--> $DIR/time-macros-impl/src/lib.rs:5:32
33
|
44
LL | #[my_macro] struct One($name);
55
| ^^^^^
66
|
7-
::: $DIR/group-compat-hack.rs:27:5
7+
::: $DIR/group-compat-hack.rs:26:5
88
|
99
LL | impl_macros!(Foo);
1010
| ------------------ in this macro invocation
1111
|
12-
= note: `#[warn(proc_macro_back_compat)]` on by default
12+
= note: `#[deny(proc_macro_back_compat)]` on by default
1313
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
1414
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
1515
= note: the `time-macros-impl` crate will stop compiling in futures version of Rust. Please update to the latest version of the `time` crate to avoid breakage
16-
= note: this warning originates in the macro `impl_macros` (in Nightly builds, run with -Z macro-backtrace for more info)
16+
= note: this error originates in the macro `impl_macros` (in Nightly builds, run with -Z macro-backtrace for more info)
1717

18-
warning: using an old version of `time-macros-impl`
18+
error: using an old version of `time-macros-impl`
1919
--> $DIR/time-macros-impl-0.1.0/src/lib.rs:5:32
2020
|
2121
LL | #[my_macro] struct One($name);
2222
| ^^^^^
2323
|
24-
::: $DIR/group-compat-hack.rs:44:5
24+
::: $DIR/group-compat-hack.rs:43:5
2525
|
2626
LL | impl_macros!(Foo);
2727
| ------------------ in this macro invocation
2828
|
2929
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
3030
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
3131
= note: the `time-macros-impl` crate will stop compiling in futures version of Rust. Please update to the latest version of the `time` crate to avoid breakage
32-
= note: this warning originates in the macro `impl_macros` (in Nightly builds, run with -Z macro-backtrace for more info)
32+
= note: this error originates in the macro `impl_macros` (in Nightly builds, run with -Z macro-backtrace for more info)
3333

34-
warning: using an old version of `js-sys`
34+
error: using an old version of `js-sys`
3535
--> $DIR/js-sys-0.3.17/src/lib.rs:5:32
3636
|
3737
LL | #[my_macro] struct Two($name);
3838
| ^^^^^
3939
|
40-
::: $DIR/group-compat-hack.rs:46:5
40+
::: $DIR/group-compat-hack.rs:45:5
4141
|
4242
LL | arrays!(Foo);
4343
| ------------- in this macro invocation
4444
|
4545
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
4646
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
4747
= note: older versions of the `js-sys` crate will stop compiling in future versions of Rust; please update to `js-sys` v0.3.40 or above
48-
= note: this warning originates in the macro `arrays` (in Nightly builds, run with -Z macro-backtrace for more info)
48+
= note: this error originates in the macro `arrays` (in Nightly builds, run with -Z macro-backtrace for more info)
4949

50-
warning: using an old version of `actix-web`
50+
error: using an old version of `actix-web`
5151
--> $DIR/actix-web/src/extract.rs:5:34
5252
|
5353
LL | #[my_macro] struct Three($T);
5454
| ^^
5555
|
56-
::: $DIR/group-compat-hack.rs:55:5
56+
::: $DIR/group-compat-hack.rs:54:5
5757
|
5858
LL | tuple_from_req!(Foo);
5959
| --------------------- in this macro invocation
6060
|
6161
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
6262
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
6363
= note: the version of `actix-web` you are using might stop compiling in future versions of Rust; please update to the latest version of the `actix-web` crate to avoid breakage
64-
= note: this warning originates in the macro `tuple_from_req` (in Nightly builds, run with -Z macro-backtrace for more info)
64+
= note: this error originates in the macro `tuple_from_req` (in Nightly builds, run with -Z macro-backtrace for more info)
6565

66-
warning: using an old version of `actix-web`
66+
error: using an old version of `actix-web`
6767
--> $DIR/actix-web-2.0.0/src/extract.rs:5:34
6868
|
6969
LL | #[my_macro] struct Three($T);
7070
| ^^
7171
|
72-
::: $DIR/group-compat-hack.rs:63:5
72+
::: $DIR/group-compat-hack.rs:62:5
7373
|
7474
LL | tuple_from_req!(Foo);
7575
| --------------------- in this macro invocation
7676
|
7777
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
7878
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
7979
= note: the version of `actix-web` you are using might stop compiling in future versions of Rust; please update to the latest version of the `actix-web` crate to avoid breakage
80-
= note: this warning originates in the macro `tuple_from_req` (in Nightly builds, run with -Z macro-backtrace for more info)
80+
= note: this error originates in the macro `tuple_from_req` (in Nightly builds, run with -Z macro-backtrace for more info)
8181

82-
warning: 5 warnings emitted
82+
error: aborting due to 5 previous errors
8383

8484
Future incompatibility report: Future breakage diagnostic:
85-
warning: using an old version of `time-macros-impl`
85+
error: using an old version of `time-macros-impl`
8686
--> $DIR/time-macros-impl/src/lib.rs:5:32
8787
|
8888
LL | #[my_macro] struct One($name);
8989
| ^^^^^
9090
|
91-
::: $DIR/group-compat-hack.rs:27:5
91+
::: $DIR/group-compat-hack.rs:26:5
9292
|
9393
LL | impl_macros!(Foo);
9494
| ------------------ in this macro invocation
9595
|
96-
= note: `#[warn(proc_macro_back_compat)]` on by default
96+
= note: `#[deny(proc_macro_back_compat)]` on by default
9797
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
9898
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
9999
= note: the `time-macros-impl` crate will stop compiling in futures version of Rust. Please update to the latest version of the `time` crate to avoid breakage
100-
= note: this warning originates in the macro `impl_macros` (in Nightly builds, run with -Z macro-backtrace for more info)
100+
= note: this error originates in the macro `impl_macros` (in Nightly builds, run with -Z macro-backtrace for more info)
101101

102102
Future breakage diagnostic:
103-
warning: using an old version of `time-macros-impl`
103+
error: using an old version of `time-macros-impl`
104104
--> $DIR/time-macros-impl-0.1.0/src/lib.rs:5:32
105105
|
106106
LL | #[my_macro] struct One($name);
107107
| ^^^^^
108108
|
109-
::: $DIR/group-compat-hack.rs:44:5
109+
::: $DIR/group-compat-hack.rs:43:5
110110
|
111111
LL | impl_macros!(Foo);
112112
| ------------------ in this macro invocation
113113
|
114114
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
115115
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
116116
= note: the `time-macros-impl` crate will stop compiling in futures version of Rust. Please update to the latest version of the `time` crate to avoid breakage
117-
= note: this warning originates in the macro `impl_macros` (in Nightly builds, run with -Z macro-backtrace for more info)
117+
= note: this error originates in the macro `impl_macros` (in Nightly builds, run with -Z macro-backtrace for more info)
118118

119119
Future breakage diagnostic:
120-
warning: using an old version of `js-sys`
120+
error: using an old version of `js-sys`
121121
--> $DIR/js-sys-0.3.17/src/lib.rs:5:32
122122
|
123123
LL | #[my_macro] struct Two($name);
124124
| ^^^^^
125125
|
126-
::: $DIR/group-compat-hack.rs:46:5
126+
::: $DIR/group-compat-hack.rs:45:5
127127
|
128128
LL | arrays!(Foo);
129129
| ------------- in this macro invocation
130130
|
131131
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
132132
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
133133
= note: older versions of the `js-sys` crate will stop compiling in future versions of Rust; please update to `js-sys` v0.3.40 or above
134-
= note: this warning originates in the macro `arrays` (in Nightly builds, run with -Z macro-backtrace for more info)
134+
= note: this error originates in the macro `arrays` (in Nightly builds, run with -Z macro-backtrace for more info)
135135

136136
Future breakage diagnostic:
137-
warning: using an old version of `actix-web`
137+
error: using an old version of `actix-web`
138138
--> $DIR/actix-web/src/extract.rs:5:34
139139
|
140140
LL | #[my_macro] struct Three($T);
141141
| ^^
142142
|
143-
::: $DIR/group-compat-hack.rs:55:5
143+
::: $DIR/group-compat-hack.rs:54:5
144144
|
145145
LL | tuple_from_req!(Foo);
146146
| --------------------- in this macro invocation
147147
|
148148
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
149149
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
150150
= note: the version of `actix-web` you are using might stop compiling in future versions of Rust; please update to the latest version of the `actix-web` crate to avoid breakage
151-
= note: this warning originates in the macro `tuple_from_req` (in Nightly builds, run with -Z macro-backtrace for more info)
151+
= note: this error originates in the macro `tuple_from_req` (in Nightly builds, run with -Z macro-backtrace for more info)
152152

153153
Future breakage diagnostic:
154-
warning: using an old version of `actix-web`
154+
error: using an old version of `actix-web`
155155
--> $DIR/actix-web-2.0.0/src/extract.rs:5:34
156156
|
157157
LL | #[my_macro] struct Three($T);
158158
| ^^
159159
|
160-
::: $DIR/group-compat-hack.rs:63:5
160+
::: $DIR/group-compat-hack.rs:62:5
161161
|
162162
LL | tuple_from_req!(Foo);
163163
| --------------------- in this macro invocation
164164
|
165165
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
166166
= note: for more information, see issue #83125 <https://github.com/rust-lang/rust/issues/83125>
167167
= note: the version of `actix-web` you are using might stop compiling in future versions of Rust; please update to the latest version of the `actix-web` crate to avoid breakage
168-
= note: this warning originates in the macro `tuple_from_req` (in Nightly builds, run with -Z macro-backtrace for more info)
168+
= note: this error originates in the macro `tuple_from_req` (in Nightly builds, run with -Z macro-backtrace for more info)
169169

0 commit comments

Comments
 (0)