Skip to content

Commit 0423d86

Browse files
tgross35tgross35
committed
Make missing_fragment_specifier an unconditional error
This was attempted in [1] then reverted in [2] because of fallout. Recently, this was made an edition-dependent error in [3]. Make missing fragment specifiers an unconditional error again. [1]: rust-lang#75516 [2]: rust-lang#80210 [3]: rust-lang#128006
1 parent 4e1356b commit 0423d86

19 files changed

+107
-277
lines changed

‎compiler/rustc_expand/src/mbe/macro_check.rs

+6-19
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,8 @@ use rustc_ast::{DUMMY_NODE_ID, NodeId};
112112
use rustc_data_structures::fx::FxHashMap;
113113
use rustc_errors::MultiSpan;
114114
use rustc_lint_defs::BuiltinLintDiag;
115-
use rustc_session::lint::builtin::{META_VARIABLE_MISUSE, MISSING_FRAGMENT_SPECIFIER};
115+
use rustc_session::lint::builtin::META_VARIABLE_MISUSE;
116116
use rustc_session::parse::ParseSess;
117-
use rustc_span::edition::Edition;
118117
use rustc_span::{ErrorGuaranteed, MacroRulesNormalizedIdent, Span, kw};
119118
use smallvec::SmallVec;
120119

@@ -266,23 +265,11 @@ fn check_binders(
266265
// Similarly, this can only happen when checking a toplevel macro.
267266
TokenTree::MetaVarDecl(span, name, kind) => {
268267
if kind.is_none() && node_id != DUMMY_NODE_ID {
269-
// FIXME: Report this as a hard error eventually and remove equivalent errors from
270-
// `parse_tt_inner` and `nameize`. Until then the error may be reported twice, once
271-
// as a hard error and then once as a buffered lint.
272-
if span.edition() >= Edition::Edition2024 {
273-
psess.dcx().emit_err(errors::MissingFragmentSpecifier {
274-
span,
275-
add_span: span.shrink_to_hi(),
276-
valid: VALID_FRAGMENT_NAMES_MSG,
277-
});
278-
} else {
279-
psess.buffer_lint(
280-
MISSING_FRAGMENT_SPECIFIER,
281-
span,
282-
node_id,
283-
BuiltinLintDiag::MissingFragmentSpecifier,
284-
);
285-
}
268+
psess.dcx().emit_err(errors::MissingFragmentSpecifier {
269+
span,
270+
add_span: span.shrink_to_hi(),
271+
valid: VALID_FRAGMENT_NAMES_MSG,
272+
});
286273
}
287274
if !macros.is_empty() {
288275
psess.dcx().span_bug(span, "unexpected MetaVarDecl in nested lhs");

‎compiler/rustc_lint/messages.ftl

-2
Original file line numberDiff line numberDiff line change
@@ -499,8 +499,6 @@ lint_metavariable_still_repeating = variable `{$name}` is still repeating at thi
499499
500500
lint_metavariable_wrong_operator = meta-variable repeats with different Kleene operator
501501
502-
lint_missing_fragment_specifier = missing fragment specifier
503-
504502
lint_missing_unsafe_on_extern = extern blocks should be unsafe
505503
.suggestion = needs `unsafe` before the extern keyword
506504

‎compiler/rustc_lint/src/early/diagnostics.rs

-3
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,6 @@ pub(super) fn decorate_lint(
411411
BuiltinLintDiag::CfgAttrNoAttributes => {
412412
lints::CfgAttrNoAttributes.decorate_lint(diag);
413413
}
414-
BuiltinLintDiag::MissingFragmentSpecifier => {
415-
lints::MissingFragmentSpecifier.decorate_lint(diag);
416-
}
417414
BuiltinLintDiag::MetaVariableStillRepeating(name) => {
418415
lints::MetaVariableStillRepeating { name }.decorate_lint(diag);
419416
}

‎compiler/rustc_lint/src/lints.rs

-4
Original file line numberDiff line numberDiff line change
@@ -2540,10 +2540,6 @@ pub(crate) struct DuplicateMacroAttribute;
25402540
#[diag(lint_cfg_attr_no_attributes)]
25412541
pub(crate) struct CfgAttrNoAttributes;
25422542

2543-
#[derive(LintDiagnostic)]
2544-
#[diag(lint_missing_fragment_specifier)]
2545-
pub(crate) struct MissingFragmentSpecifier;
2546-
25472543
#[derive(LintDiagnostic)]
25482544
#[diag(lint_metavariable_still_repeating)]
25492545
pub(crate) struct MetaVariableStillRepeating {

‎compiler/rustc_lint_defs/src/builtin.rs

-45
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ declare_lint_pass! {
6666
MACRO_USE_EXTERN_CRATE,
6767
META_VARIABLE_MISUSE,
6868
MISSING_ABI,
69-
MISSING_FRAGMENT_SPECIFIER,
7069
MISSING_UNSAFE_ON_EXTERN,
7170
MUST_NOT_SUSPEND,
7271
NAMED_ARGUMENTS_USED_POSITIONALLY,
@@ -1416,50 +1415,6 @@ declare_lint! {
14161415
};
14171416
}
14181417

1419-
declare_lint! {
1420-
/// The `missing_fragment_specifier` lint is issued when an unused pattern in a
1421-
/// `macro_rules!` macro definition has a meta-variable (e.g. `$e`) that is not
1422-
/// followed by a fragment specifier (e.g. `:expr`).
1423-
///
1424-
/// This warning can always be fixed by removing the unused pattern in the
1425-
/// `macro_rules!` macro definition.
1426-
///
1427-
/// ### Example
1428-
///
1429-
/// ```rust,compile_fail
1430-
/// macro_rules! foo {
1431-
/// () => {};
1432-
/// ($name) => { };
1433-
/// }
1434-
///
1435-
/// fn main() {
1436-
/// foo!();
1437-
/// }
1438-
/// ```
1439-
///
1440-
/// {{produces}}
1441-
///
1442-
/// ### Explanation
1443-
///
1444-
/// To fix this, remove the unused pattern from the `macro_rules!` macro definition:
1445-
///
1446-
/// ```rust
1447-
/// macro_rules! foo {
1448-
/// () => {};
1449-
/// }
1450-
/// fn main() {
1451-
/// foo!();
1452-
/// }
1453-
/// ```
1454-
pub MISSING_FRAGMENT_SPECIFIER,
1455-
Deny,
1456-
"detects missing fragment specifiers in unused `macro_rules!` patterns",
1457-
@future_incompatible = FutureIncompatibleInfo {
1458-
reason: FutureIncompatibilityReason::FutureReleaseErrorReportInDeps,
1459-
reference: "issue #40107 <https://github.com/rust-lang/rust/issues/40107>",
1460-
};
1461-
}
1462-
14631418
declare_lint! {
14641419
/// The `late_bound_lifetime_arguments` lint detects generic lifetime
14651420
/// arguments in path segments with late bound lifetime parameters.

‎compiler/rustc_lint_defs/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,6 @@ pub enum BuiltinLintDiag {
803803
UnnameableTestItems,
804804
DuplicateMacroAttribute,
805805
CfgAttrNoAttributes,
806-
MissingFragmentSpecifier,
807806
MetaVariableStillRepeating(MacroRulesNormalizedIdent),
808807
MetaVariableWrongOperator,
809808
DuplicateMatcherBinding,

‎tests/ui/lint/expansion-time.rs

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ macro_rules! foo {
55
( $($i:ident)* ) => { $($i)+ }; //~ WARN meta-variable repeats with different Kleene operator
66
}
77

8-
#[warn(missing_fragment_specifier)]
9-
macro_rules! m { ($i) => {} } //~ WARN missing fragment specifier
10-
//~| WARN this was previously accepted
11-
128
#[warn(soft_unstable)]
139
mod benches {
1410
#[bench] //~ WARN use of unstable library feature `test`

‎tests/ui/lint/expansion-time.stderr

+49-4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ note: the lint level is defined here
1212
LL | #[warn(meta_variable_misuse)]
1313
| ^^^^^^^^^^^^^^^^^^^^
1414

15+
<<<<<<< HEAD
1516
warning: missing fragment specifier
1617
--> $DIR/expansion-time.rs:9:19
1718
|
@@ -28,14 +29,35 @@ LL | #[warn(missing_fragment_specifier)]
2829

2930
warning: use of unstable library feature `test`: `bench` is a part of custom test frameworks which are unstable
3031
--> $DIR/expansion-time.rs:14:7
32+
||||||| parent of f2d1d82e0c8 (Make `missing_fragment_specifier` an unconditional error)
33+
warning: missing fragment specifier
34+
--> $DIR/expansion-time.rs:9:19
35+
|
36+
LL | macro_rules! m { ($i) => {} }
37+
| ^^
38+
|
39+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
40+
= note: for more information, see issue #40107 <https://github.com/rust-lang/rust/issues/40107>
41+
note: the lint level is defined here
42+
--> $DIR/expansion-time.rs:8:8
43+
|
44+
LL | #[warn(missing_fragment_specifier)]
45+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
46+
47+
warning: use of unstable library feature 'test': `bench` is a part of custom test frameworks which are unstable
48+
--> $DIR/expansion-time.rs:14:7
49+
=======
50+
warning: use of unstable library feature 'test': `bench` is a part of custom test frameworks which are unstable
51+
--> $DIR/expansion-time.rs:10:7
52+
>>>>>>> f2d1d82e0c8 (Make `missing_fragment_specifier` an unconditional error)
3153
|
3254
LL | #[bench]
3355
| ^^^^^
3456
|
3557
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
3658
= note: for more information, see issue #64266 <https://github.com/rust-lang/rust/issues/64266>
3759
note: the lint level is defined here
38-
--> $DIR/expansion-time.rs:12:8
60+
--> $DIR/expansion-time.rs:8:8
3961
|
4062
LL | #[warn(soft_unstable)]
4163
| ^^^^^^^^^^^^^
@@ -47,14 +69,15 @@ LL | 2
4769
| ^
4870
|
4971
note: the lint level is defined here
50-
--> $DIR/expansion-time.rs:29:8
72+
--> $DIR/expansion-time.rs:25:8
5173
|
5274
LL | #[warn(incomplete_include)]
5375
| ^^^^^^^^^^^^^^^^^^
5476

55-
warning: 4 warnings emitted
77+
warning: 3 warnings emitted
5678

5779
Future incompatibility report: Future breakage diagnostic:
80+
<<<<<<< HEAD
5881
warning: missing fragment specifier
5982
--> $DIR/expansion-time.rs:9:19
6083
|
@@ -72,14 +95,36 @@ LL | #[warn(missing_fragment_specifier)]
7295
Future breakage diagnostic:
7396
warning: use of unstable library feature `test`: `bench` is a part of custom test frameworks which are unstable
7497
--> $DIR/expansion-time.rs:14:7
98+
||||||| parent of f2d1d82e0c8 (Make `missing_fragment_specifier` an unconditional error)
99+
warning: missing fragment specifier
100+
--> $DIR/expansion-time.rs:9:19
101+
|
102+
LL | macro_rules! m { ($i) => {} }
103+
| ^^
104+
|
105+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
106+
= note: for more information, see issue #40107 <https://github.com/rust-lang/rust/issues/40107>
107+
note: the lint level is defined here
108+
--> $DIR/expansion-time.rs:8:8
109+
|
110+
LL | #[warn(missing_fragment_specifier)]
111+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
112+
113+
Future breakage diagnostic:
114+
warning: use of unstable library feature 'test': `bench` is a part of custom test frameworks which are unstable
115+
--> $DIR/expansion-time.rs:14:7
116+
=======
117+
warning: use of unstable library feature 'test': `bench` is a part of custom test frameworks which are unstable
118+
--> $DIR/expansion-time.rs:10:7
119+
>>>>>>> f2d1d82e0c8 (Make `missing_fragment_specifier` an unconditional error)
75120
|
76121
LL | #[bench]
77122
| ^^^^^
78123
|
79124
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
80125
= note: for more information, see issue #64266 <https://github.com/rust-lang/rust/issues/64266>
81126
note: the lint level is defined here
82-
--> $DIR/expansion-time.rs:12:8
127+
--> $DIR/expansion-time.rs:8:8
83128
|
84129
LL | #[warn(soft_unstable)]
85130
| ^^^^^^^^^^^^^

‎tests/ui/macros/issue-39404.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![allow(unused)]
22

3-
macro_rules! m { ($i) => {} }
4-
//~^ ERROR missing fragment specifier
5-
//~| WARN previously accepted
3+
macro_rules! m {
4+
($i) => {}; //~ ERROR missing fragment specifier
5+
}
66

77
fn main() {}

‎tests/ui/macros/issue-39404.stderr

+9-17
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
11
error: missing fragment specifier
2-
--> $DIR/issue-39404.rs:3:19
2+
--> $DIR/issue-39404.rs:4:6
33
|
4-
LL | macro_rules! m { ($i) => {} }
5-
| ^^
4+
LL | ($i) => {};
5+
| ^^
66
|
7-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
8-
= note: for more information, see issue #40107 <https://github.com/rust-lang/rust/issues/40107>
9-
= note: `#[deny(missing_fragment_specifier)]` on by default
7+
= note: fragment specifiers must be specified in the 2024 edition
8+
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`, along with `expr_2021` and `pat_param` for edition compatibility
9+
help: try adding a specifier here
10+
|
11+
LL | ($i:spec) => {};
12+
| +++++
1013

1114
error: aborting due to 1 previous error
1215

13-
Future incompatibility report: Future breakage diagnostic:
14-
error: missing fragment specifier
15-
--> $DIR/issue-39404.rs:3:19
16-
|
17-
LL | macro_rules! m { ($i) => {} }
18-
| ^^
19-
|
20-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
21-
= note: for more information, see issue #40107 <https://github.com/rust-lang/rust/issues/40107>
22-
= note: `#[deny(missing_fragment_specifier)]` on by default
23-

‎tests/ui/macros/macro-match-nonterminal.rs

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ macro_rules! test {
33
//~^ ERROR missing fragment
44
//~| ERROR missing fragment
55
//~| ERROR missing fragment
6-
//~| WARN this was previously accepted
7-
//~| WARN this was previously accepted
86
()
97
};
108
}

‎tests/ui/macros/macro-match-nonterminal.stderr

+12-27
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,32 @@ error: missing fragment specifier
33
|
44
LL | ($a, $b) => {
55
| ^^
6-
7-
error: missing fragment specifier
8-
--> $DIR/macro-match-nonterminal.rs:2:6
96
|
10-
LL | ($a, $b) => {
11-
| ^^
7+
= note: fragment specifiers must be specified in the 2024 edition
8+
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`, along with `expr_2021` and `pat_param` for edition compatibility
9+
help: try adding a specifier here
1210
|
13-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
14-
= note: for more information, see issue #40107 <https://github.com/rust-lang/rust/issues/40107>
15-
= note: `#[deny(missing_fragment_specifier)]` on by default
11+
LL | ($a:spec, $b) => {
12+
| +++++
1613

1714
error: missing fragment specifier
1815
--> $DIR/macro-match-nonterminal.rs:2:10
1916
|
2017
LL | ($a, $b) => {
2118
| ^^
2219
|
23-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
24-
= note: for more information, see issue #40107 <https://github.com/rust-lang/rust/issues/40107>
25-
26-
error: aborting due to 3 previous errors
20+
= note: fragment specifiers must be specified in the 2024 edition
21+
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`, along with `expr_2021` and `pat_param` for edition compatibility
22+
help: try adding a specifier here
23+
|
24+
LL | ($a, $b:spec) => {
25+
| +++++
2726

28-
Future incompatibility report: Future breakage diagnostic:
2927
error: missing fragment specifier
3028
--> $DIR/macro-match-nonterminal.rs:2:6
3129
|
3230
LL | ($a, $b) => {
3331
| ^^
34-
|
35-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
36-
= note: for more information, see issue #40107 <https://github.com/rust-lang/rust/issues/40107>
37-
= note: `#[deny(missing_fragment_specifier)]` on by default
3832

39-
Future breakage diagnostic:
40-
error: missing fragment specifier
41-
--> $DIR/macro-match-nonterminal.rs:2:10
42-
|
43-
LL | ($a, $b) => {
44-
| ^^
45-
|
46-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
47-
= note: for more information, see issue #40107 <https://github.com/rust-lang/rust/issues/40107>
48-
= note: `#[deny(missing_fragment_specifier)]` on by default
33+
error: aborting due to 3 previous errors
4934

‎tests/ui/macros/macro-missing-fragment-deduplication.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
//@ compile-flags: -Zdeduplicate-diagnostics=yes
22

33
macro_rules! m {
4-
($name) => {}
5-
//~^ ERROR missing fragment
6-
//~| ERROR missing fragment
7-
//~| WARN this was previously accepted
4+
($name) => {}; //~ ERROR missing fragment
5+
//~| ERROR missing fragment
86
}
97

108
fn main() {

0 commit comments

Comments
 (0)