Skip to content

Commit 7a2b5c8

Browse files
compiler-errorscompiler-errors
authored
Rollup merge of rust-lang#103418 - Aaron1011:macro-semicolon-future-incompat, r=davidtwco
Add `SEMICOLON_IN_EXPRESSIONS_FROM_MACROS` to future-incompat report See rust-lang#79813 for a discussion of this lint. This has been warn-by-default for over a year, so adding it to the future-incompat report should help to find libraries that haven't yet updated.
2 parents 1c394e1 + dc88761 commit 7a2b5c8

7 files changed

+221
-0
lines changed

‎compiler/rustc_lint_defs/src/builtin.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2948,6 +2948,7 @@ declare_lint! {
29482948
"trailing semicolon in macro body used as expression",
29492949
@future_incompatible = FutureIncompatibleInfo {
29502950
reference: "issue #79813 <https://github.com/rust-lang/rust/issues/79813>",
2951+
reason: FutureIncompatibilityReason::FutureReleaseErrorReportNow,
29512952
};
29522953
}
29532954

‎tests/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.stderr

+137
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,140 @@ LL | let _ = #[allow(semicolon_in_expressions_from_macros)] foo!(allow_does_
4646

4747
warning: 3 warnings emitted
4848

49+
Future incompatibility report: Future breakage diagnostic:
50+
warning: trailing semicolon in macro used in expression position
51+
--> $DIR/semicolon-in-expressions-from-macros.rs:9:13
52+
|
53+
LL | true;
54+
| ^
55+
...
56+
LL | foo!(first)
57+
| ----------- in this macro invocation
58+
|
59+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
60+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
61+
= note: macro invocations at the end of a block are treated as expressions
62+
= note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
63+
note: the lint level is defined here
64+
--> $DIR/semicolon-in-expressions-from-macros.rs:24:13
65+
|
66+
LL | #[allow(semicolon_in_expressions_from_macros)]
67+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
68+
= note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
69+
70+
Future breakage diagnostic:
71+
warning: trailing semicolon in macro used in expression position
72+
--> $DIR/semicolon-in-expressions-from-macros.rs:9:13
73+
|
74+
LL | true;
75+
| ^
76+
...
77+
LL | let _ = foo!(second);
78+
| ------------ in this macro invocation
79+
|
80+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
81+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
82+
note: the lint level is defined here
83+
--> $DIR/semicolon-in-expressions-from-macros.rs:29:13
84+
|
85+
LL | #[allow(semicolon_in_expressions_from_macros)]
86+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
87+
= note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
88+
89+
Future breakage diagnostic:
90+
warning: trailing semicolon in macro used in expression position
91+
--> $DIR/semicolon-in-expressions-from-macros.rs:9:13
92+
|
93+
LL | true;
94+
| ^
95+
...
96+
LL | let _ = foo!(third);
97+
| ----------- in this macro invocation
98+
|
99+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
100+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
101+
note: the lint level is defined here
102+
--> $DIR/semicolon-in-expressions-from-macros.rs:32:13
103+
|
104+
LL | #[allow(semicolon_in_expressions_from_macros)]
105+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
106+
= note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
107+
108+
Future breakage diagnostic:
109+
warning: trailing semicolon in macro used in expression position
110+
--> $DIR/semicolon-in-expressions-from-macros.rs:9:13
111+
|
112+
LL | true;
113+
| ^
114+
...
115+
LL | let _ = foo!(fourth);
116+
| ------------ in this macro invocation
117+
|
118+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
119+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
120+
note: the lint level is defined here
121+
--> $DIR/semicolon-in-expressions-from-macros.rs:37:13
122+
|
123+
LL | #[allow(semicolon_in_expressions_from_macros)]
124+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
125+
= note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
126+
127+
Future breakage diagnostic:
128+
warning: trailing semicolon in macro used in expression position
129+
--> $DIR/semicolon-in-expressions-from-macros.rs:9:13
130+
|
131+
LL | true;
132+
| ^
133+
...
134+
LL | foo!(warn_in_block)
135+
| ------------------- in this macro invocation
136+
|
137+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
138+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
139+
= note: macro invocations at the end of a block are treated as expressions
140+
= note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
141+
note: the lint level is defined here
142+
--> $DIR/semicolon-in-expressions-from-macros.rs:4:9
143+
|
144+
LL | #![warn(semicolon_in_expressions_from_macros)]
145+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
146+
= note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
147+
148+
Future breakage diagnostic:
149+
warning: trailing semicolon in macro used in expression position
150+
--> $DIR/semicolon-in-expressions-from-macros.rs:9:13
151+
|
152+
LL | true;
153+
| ^
154+
...
155+
LL | let _ = foo!(warn_in_expr);
156+
| ------------------ in this macro invocation
157+
|
158+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
159+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
160+
note: the lint level is defined here
161+
--> $DIR/semicolon-in-expressions-from-macros.rs:4:9
162+
|
163+
LL | #![warn(semicolon_in_expressions_from_macros)]
164+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
165+
= note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
166+
167+
Future breakage diagnostic:
168+
warning: trailing semicolon in macro used in expression position
169+
--> $DIR/semicolon-in-expressions-from-macros.rs:9:13
170+
|
171+
LL | true;
172+
| ^
173+
...
174+
LL | let _ = #[allow(semicolon_in_expressions_from_macros)] foo!(allow_does_not_work);
175+
| ------------------------- in this macro invocation
176+
|
177+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
178+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
179+
note: the lint level is defined here
180+
--> $DIR/semicolon-in-expressions-from-macros.rs:4:9
181+
|
182+
LL | #![warn(semicolon_in_expressions_from_macros)]
183+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
184+
= note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
185+

‎tests/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.stderr

+15
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,18 @@ LL | _ => foo!()
1414

1515
warning: 1 warning emitted
1616

17+
Future incompatibility report: Future breakage diagnostic:
18+
warning: trailing semicolon in macro used in expression position
19+
--> $DIR/warn-semicolon-in-expressions-from-macros.rs:6:13
20+
|
21+
LL | true;
22+
| ^
23+
...
24+
LL | _ => foo!()
25+
| ------ in this macro invocation
26+
|
27+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
28+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
29+
= note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
30+
= note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
31+

‎tests/ui/macros/issue-84195-lint-anon-const.stderr

+19
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,22 @@ LL | #![deny(semicolon_in_expressions_from_macros)]
1818

1919
error: aborting due to previous error
2020

21+
Future incompatibility report: Future breakage diagnostic:
22+
error: trailing semicolon in macro used in expression position
23+
--> $DIR/issue-84195-lint-anon-const.rs:8:14
24+
|
25+
LL | () => { 0; };
26+
| ^
27+
...
28+
LL | let val: [u8; len!()] = [];
29+
| ------ in this macro invocation
30+
|
31+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
32+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
33+
note: the lint level is defined here
34+
--> $DIR/issue-84195-lint-anon-const.rs:5:9
35+
|
36+
LL | #![deny(semicolon_in_expressions_from_macros)]
37+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
38+
= note: this error originates in the macro `len` (in Nightly builds, run with -Z macro-backtrace for more info)
39+

‎tests/ui/macros/lint-trailing-macro-call.stderr

+17
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,20 @@ LL | expand_it!()
1616

1717
warning: 1 warning emitted
1818

19+
Future incompatibility report: Future breakage diagnostic:
20+
warning: trailing semicolon in macro used in expression position
21+
--> $DIR/lint-trailing-macro-call.rs:9:25
22+
|
23+
LL | #[cfg(FALSE)] 25;
24+
| ^
25+
...
26+
LL | expand_it!()
27+
| ------------ in this macro invocation
28+
|
29+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
30+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
31+
= note: macro invocations at the end of a block are treated as expressions
32+
= note: to ignore the value produced by the macro, add a semicolon after the invocation of `expand_it`
33+
= note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
34+
= note: this warning originates in the macro `expand_it` (in Nightly builds, run with -Z macro-backtrace for more info)
35+

‎tests/ui/macros/macro-context.stderr

+15
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,18 @@ error: aborting due to 6 previous errors; 1 warning emitted
8282

8383
Some errors have detailed explanations: E0412, E0425.
8484
For more information about an error, try `rustc --explain E0412`.
85+
Future incompatibility report: Future breakage diagnostic:
86+
warning: trailing semicolon in macro used in expression position
87+
--> $DIR/macro-context.rs:3:15
88+
|
89+
LL | () => ( i ; typeof );
90+
| ^
91+
...
92+
LL | let i = m!();
93+
| ---- in this macro invocation
94+
|
95+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
96+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
97+
= note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
98+
= note: this warning originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
99+

‎tests/ui/macros/macro-in-expression-context.stderr

+17
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,20 @@ LL | foo!()
3131

3232
error: aborting due to previous error; 1 warning emitted
3333

34+
Future incompatibility report: Future breakage diagnostic:
35+
warning: trailing semicolon in macro used in expression position
36+
--> $DIR/macro-in-expression-context.rs:5:29
37+
|
38+
LL | assert_eq!("A", "A");
39+
| ^
40+
...
41+
LL | foo!()
42+
| ------ in this macro invocation
43+
|
44+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
45+
= note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
46+
= note: macro invocations at the end of a block are treated as expressions
47+
= note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
48+
= note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
49+
= note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
50+

0 commit comments

Comments
 (0)