Skip to content

Commit 86a97c4

Browse files
JonathanBrouwerJonathanBrouwer
committed
Remove lifetime param from parser types
1 parent 97252d3 commit 86a97c4

25 files changed

+119
-128
lines changed

‎compiler/rustc_attr_parsing/src/attributes/allow_unstable.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ impl<S: Stage> CombineAttributeParser<S> for AllowInternalUnstableParser {
1919

2020
fn extend<'c>(
2121
cx: &'c mut AcceptContext<'_, '_, S>,
22-
args: &'c ArgParser<'_>,
22+
args: &'c ArgParser,
2323
) -> impl IntoIterator<Item = Self::Item> {
2424
parse_unstable(cx, args, <Self as CombineAttributeParser<S>>::PATH[0])
2525
.into_iter()
@@ -41,7 +41,7 @@ impl<S: Stage> CombineAttributeParser<S> for UnstableFeatureBoundParser {
4141

4242
fn extend<'c>(
4343
cx: &'c mut AcceptContext<'_, '_, S>,
44-
args: &'c ArgParser<'_>,
44+
args: &'c ArgParser,
4545
) -> impl IntoIterator<Item = Self::Item> {
4646
if !cx.features().staged_api() {
4747
cx.emit_err(session_diagnostics::StabilityOutsideStd { span: cx.attr_span });
@@ -69,15 +69,15 @@ impl<S: Stage> CombineAttributeParser<S> for AllowConstFnUnstableParser {
6969

7070
fn extend<'c>(
7171
cx: &'c mut AcceptContext<'_, '_, S>,
72-
args: &'c ArgParser<'_>,
72+
args: &'c ArgParser,
7373
) -> impl IntoIterator<Item = Self::Item> + 'c {
7474
parse_unstable(cx, args, <Self as CombineAttributeParser<S>>::PATH[0])
7575
}
7676
}
7777

7878
fn parse_unstable<S: Stage>(
7979
cx: &AcceptContext<'_, '_, S>,
80-
args: &ArgParser<'_>,
80+
args: &ArgParser,
8181
symbol: Symbol,
8282
) -> impl IntoIterator<Item = Symbol> {
8383
let mut res = Vec::new();

‎compiler/rustc_attr_parsing/src/attributes/cfg.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const CFG_ATTR_TEMPLATE: AttributeTemplate = template!(
3737

3838
pub fn parse_cfg<'c, S: Stage>(
3939
cx: &'c mut AcceptContext<'_, '_, S>,
40-
args: &'c ArgParser<'_>,
40+
args: &'c ArgParser,
4141
) -> Option<CfgEntry> {
4242
let ArgParser::List(list) = args else {
4343
cx.expected_list(cx.attr_span);
@@ -52,7 +52,7 @@ pub fn parse_cfg<'c, S: Stage>(
5252

5353
pub fn parse_cfg_entry<S: Stage>(
5454
cx: &mut AcceptContext<'_, '_, S>,
55-
item: &MetaItemOrLitParser<'_>,
55+
item: &MetaItemOrLitParser,
5656
) -> Result<CfgEntry, ErrorGuaranteed> {
5757
Ok(match item {
5858
MetaItemOrLitParser::MetaItemParser(meta) => match meta.args() {
@@ -98,7 +98,7 @@ pub fn parse_cfg_entry<S: Stage>(
9898

9999
fn parse_cfg_entry_version<S: Stage>(
100100
cx: &mut AcceptContext<'_, '_, S>,
101-
list: &MetaItemListParser<'_>,
101+
list: &MetaItemListParser,
102102
meta_span: Span,
103103
) -> Result<CfgEntry, ErrorGuaranteed> {
104104
try_gate_cfg(sym::version, meta_span, cx.sess(), cx.features_option());
@@ -130,7 +130,7 @@ fn parse_cfg_entry_version<S: Stage>(
130130

131131
fn parse_cfg_entry_target<S: Stage>(
132132
cx: &mut AcceptContext<'_, '_, S>,
133-
list: &MetaItemListParser<'_>,
133+
list: &MetaItemListParser,
134134
meta_span: Span,
135135
) -> Result<CfgEntry, ErrorGuaranteed> {
136136
if let Some(features) = cx.features_option()

‎compiler/rustc_attr_parsing/src/attributes/codegen_attrs.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl<S: Stage> SingleAttributeParser<S> for OptimizeParser {
2323
]);
2424
const TEMPLATE: AttributeTemplate = template!(List: &["size", "speed", "none"]);
2525

26-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
26+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
2727
let Some(list) = args.list() else {
2828
cx.expected_list(cx.attr_span);
2929
return None;
@@ -84,7 +84,7 @@ impl<S: Stage> SingleAttributeParser<S> for CoverageParser {
8484
]);
8585
const TEMPLATE: AttributeTemplate = template!(OneOf: &[sym::off, sym::on]);
8686

87-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
87+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
8888
let Some(args) = args.list() else {
8989
cx.expected_specific_argument_and_list(cx.attr_span, &[sym::on, sym::off]);
9090
return None;
@@ -135,7 +135,7 @@ impl<S: Stage> SingleAttributeParser<S> for ExportNameParser {
135135
]);
136136
const TEMPLATE: AttributeTemplate = template!(NameValueStr: "name");
137137

138-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
138+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
139139
let Some(nv) = args.name_value() else {
140140
cx.expected_name_value(cx.attr_span, None);
141141
return None;
@@ -164,7 +164,7 @@ impl<S: Stage> SingleAttributeParser<S> for ObjcClassParser {
164164
AllowedTargets::AllowList(&[Allow(Target::ForeignStatic)]);
165165
const TEMPLATE: AttributeTemplate = template!(NameValueStr: "ClassName");
166166

167-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
167+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
168168
let Some(nv) = args.name_value() else {
169169
cx.expected_name_value(cx.attr_span, None);
170170
return None;
@@ -196,7 +196,7 @@ impl<S: Stage> SingleAttributeParser<S> for ObjcSelectorParser {
196196
AllowedTargets::AllowList(&[Allow(Target::ForeignStatic)]);
197197
const TEMPLATE: AttributeTemplate = template!(NameValueStr: "methodName");
198198

199-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
199+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
200200
let Some(nv) = args.name_value() else {
201201
cx.expected_name_value(cx.attr_span, None);
202202
return None;
@@ -474,7 +474,7 @@ impl<S: Stage> AttributeParser<S> for UsedParser {
474474

475475
fn parse_tf_attribute<'c, S: Stage>(
476476
cx: &'c mut AcceptContext<'_, '_, S>,
477-
args: &'c ArgParser<'_>,
477+
args: &'c ArgParser,
478478
) -> impl IntoIterator<Item = (Symbol, Span)> + 'c {
479479
let mut features = Vec::new();
480480
let ArgParser::List(list) = args else {
@@ -531,7 +531,7 @@ impl<S: Stage> CombineAttributeParser<S> for TargetFeatureParser {
531531

532532
fn extend<'c>(
533533
cx: &'c mut AcceptContext<'_, '_, S>,
534-
args: &'c ArgParser<'_>,
534+
args: &'c ArgParser,
535535
) -> impl IntoIterator<Item = Self::Item> + 'c {
536536
parse_tf_attribute(cx, args)
537537
}
@@ -569,7 +569,7 @@ impl<S: Stage> CombineAttributeParser<S> for ForceTargetFeatureParser {
569569

570570
fn extend<'c>(
571571
cx: &'c mut AcceptContext<'_, '_, S>,
572-
args: &'c ArgParser<'_>,
572+
args: &'c ArgParser,
573573
) -> impl IntoIterator<Item = Self::Item> + 'c {
574574
parse_tf_attribute(cx, args)
575575
}
@@ -599,7 +599,7 @@ impl<S: Stage> SingleAttributeParser<S> for SanitizeParser {
599599
const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepOutermost;
600600
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
601601

602-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
602+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
603603
let Some(list) = args.list() else {
604604
cx.expected_list(cx.attr_span);
605605
return None;

‎compiler/rustc_attr_parsing/src/attributes/crate_level.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ impl<S: Stage> SingleAttributeParser<S> for CrateNameParser {
1111
const TEMPLATE: AttributeTemplate = template!(NameValueStr: "name");
1212
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::CrateLevel;
1313

14-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
14+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
1515
let ArgParser::NameValue(n) = args else {
1616
cx.expected_name_value(cx.attr_span, None);
1717
return None;
@@ -35,7 +35,7 @@ impl<S: Stage> SingleAttributeParser<S> for RecursionLimitParser {
3535
const TEMPLATE: AttributeTemplate = template!(NameValueStr: "N", "https://doc.rust-lang.org/reference/attributes/limits.html#the-recursion_limit-attribute");
3636
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::CrateLevel;
3737

38-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
38+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
3939
let ArgParser::NameValue(nv) = args else {
4040
cx.expected_name_value(cx.attr_span, None);
4141
return None;
@@ -58,7 +58,7 @@ impl<S: Stage> SingleAttributeParser<S> for MoveSizeLimitParser {
5858
const TEMPLATE: AttributeTemplate = template!(NameValueStr: "N");
5959
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::CrateLevel;
6060

61-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
61+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
6262
let ArgParser::NameValue(nv) = args else {
6363
cx.expected_name_value(cx.attr_span, None);
6464
return None;
@@ -81,7 +81,7 @@ impl<S: Stage> SingleAttributeParser<S> for TypeLengthLimitParser {
8181
const TEMPLATE: AttributeTemplate = template!(NameValueStr: "N");
8282
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::CrateLevel;
8383

84-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
84+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
8585
let ArgParser::NameValue(nv) = args else {
8686
cx.expected_name_value(cx.attr_span, None);
8787
return None;
@@ -104,7 +104,7 @@ impl<S: Stage> SingleAttributeParser<S> for PatternComplexityLimitParser {
104104
const TEMPLATE: AttributeTemplate = template!(NameValueStr: "N");
105105
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::CrateLevel;
106106

107-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
107+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
108108
let ArgParser::NameValue(nv) = args else {
109109
cx.expected_name_value(cx.attr_span, None);
110110
return None;
@@ -154,7 +154,7 @@ impl<S: Stage> SingleAttributeParser<S> for WindowsSubsystemParser {
154154
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::CrateLevel;
155155
const TEMPLATE: AttributeTemplate = template!(NameValueStr: ["windows", "console"], "https://doc.rust-lang.org/reference/runtime.html#the-windows_subsystem-attribute");
156156

157-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
157+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
158158
let Some(nv) = args.name_value() else {
159159
cx.expected_name_value(
160160
args.span().unwrap_or(cx.inner_span),

‎compiler/rustc_attr_parsing/src/attributes/debugger.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ impl<S: Stage> CombineAttributeParser<S> for DebuggerViualizerParser {
1818

1919
fn extend<'c>(
2020
cx: &'c mut AcceptContext<'_, '_, S>,
21-
args: &'c ArgParser<'_>,
21+
args: &'c ArgParser,
2222
) -> impl IntoIterator<Item = Self::Item> + 'c {
2323
let Some(l) = args.list() else {
2424
cx.expected_list(args.span().unwrap_or(cx.attr_span));

‎compiler/rustc_attr_parsing/src/attributes/deprecation.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn get<S: Stage>(
1212
cx: &AcceptContext<'_, '_, S>,
1313
name: Symbol,
1414
param_span: Span,
15-
arg: &ArgParser<'_>,
15+
arg: &ArgParser,
1616
item: &Option<Symbol>,
1717
) -> Option<Symbol> {
1818
if item.is_some() {
@@ -68,7 +68,7 @@ impl<S: Stage> SingleAttributeParser<S> for DeprecationParser {
6868
NameValueStr: "reason"
6969
);
7070

71-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
71+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
7272
let features = cx.features();
7373

7474
let mut since = None;

‎compiler/rustc_attr_parsing/src/attributes/dummy.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ impl<S: Stage> SingleAttributeParser<S> for DummyParser {
1515
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(ALL_TARGETS);
1616
const TEMPLATE: AttributeTemplate = template!(Word); // Anything, really
1717

18-
fn convert(_: &mut AcceptContext<'_, '_, S>, _: &ArgParser<'_>) -> Option<AttributeKind> {
18+
fn convert(_: &mut AcceptContext<'_, '_, S>, _: &ArgParser) -> Option<AttributeKind> {
1919
Some(AttributeKind::Dummy)
2020
}
2121
}

‎compiler/rustc_attr_parsing/src/attributes/inline.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl<S: Stage> SingleAttributeParser<S> for InlineParser {
3434
"https://doc.rust-lang.org/reference/attributes/codegen.html#the-inline-attribute"
3535
);
3636

37-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
37+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
3838
match args {
3939
ArgParser::NoArgs => Some(AttributeKind::Inline(InlineAttr::Hint, cx.attr_span)),
4040
ArgParser::List(list) => {
@@ -77,7 +77,7 @@ impl<S: Stage> SingleAttributeParser<S> for RustcForceInlineParser {
7777

7878
const TEMPLATE: AttributeTemplate = template!(Word, List: &["reason"], NameValueStr: "reason");
7979

80-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
80+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
8181
let reason = match args {
8282
ArgParser::NoArgs => None,
8383
ArgParser::List(list) => {

‎compiler/rustc_attr_parsing/src/attributes/link_attrs.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl<S: Stage> SingleAttributeParser<S> for LinkNameParser {
3333
"https://doc.rust-lang.org/reference/items/external-blocks.html#the-link_name-attribute"
3434
);
3535

36-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
36+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
3737
let Some(nv) = args.name_value() else {
3838
cx.expected_name_value(cx.attr_span, None);
3939
return None;
@@ -64,7 +64,7 @@ impl<S: Stage> CombineAttributeParser<S> for LinkParser {
6464

6565
fn extend<'c>(
6666
cx: &'c mut AcceptContext<'_, '_, S>,
67-
args: &'c ArgParser<'_>,
67+
args: &'c ArgParser,
6868
) -> impl IntoIterator<Item = Self::Item> + 'c {
6969
let items = match args {
7070
ArgParser::List(list) => list,
@@ -242,7 +242,7 @@ impl<S: Stage> CombineAttributeParser<S> for LinkParser {
242242

243243
impl LinkParser {
244244
fn parse_link_name<S: Stage>(
245-
item: &MetaItemParser<'_>,
245+
item: &MetaItemParser,
246246
name: &mut Option<(Symbol, Span)>,
247247
cx: &mut AcceptContext<'_, '_, S>,
248248
) -> bool {
@@ -267,7 +267,7 @@ impl LinkParser {
267267
}
268268

269269
fn parse_link_kind<S: Stage>(
270-
item: &MetaItemParser<'_>,
270+
item: &MetaItemParser,
271271
kind: &mut Option<NativeLibKind>,
272272
cx: &mut AcceptContext<'_, '_, S>,
273273
sess: &Session,
@@ -347,7 +347,7 @@ impl LinkParser {
347347
}
348348

349349
fn parse_link_modifiers<S: Stage>(
350-
item: &MetaItemParser<'_>,
350+
item: &MetaItemParser,
351351
modifiers: &mut Option<(Symbol, Span)>,
352352
cx: &mut AcceptContext<'_, '_, S>,
353353
) -> bool {
@@ -368,7 +368,7 @@ impl LinkParser {
368368
}
369369

370370
fn parse_link_cfg<S: Stage>(
371-
item: &MetaItemParser<'_>,
371+
item: &MetaItemParser,
372372
cfg: &mut Option<CfgEntry>,
373373
cx: &mut AcceptContext<'_, '_, S>,
374374
sess: &Session,
@@ -400,7 +400,7 @@ impl LinkParser {
400400
}
401401

402402
fn parse_link_wasm_import_module<S: Stage>(
403-
item: &MetaItemParser<'_>,
403+
item: &MetaItemParser,
404404
wasm_import_module: &mut Option<(Symbol, Span)>,
405405
cx: &mut AcceptContext<'_, '_, S>,
406406
) -> bool {
@@ -421,7 +421,7 @@ impl LinkParser {
421421
}
422422

423423
fn parse_link_import_name_type<S: Stage>(
424-
item: &MetaItemParser<'_>,
424+
item: &MetaItemParser,
425425
import_name_type: &mut Option<(PeImportNameType, Span)>,
426426
cx: &mut AcceptContext<'_, '_, S>,
427427
) -> bool {
@@ -478,7 +478,7 @@ impl<S: Stage> SingleAttributeParser<S> for LinkSectionParser {
478478
"https://doc.rust-lang.org/reference/abi.html#the-link_section-attribute"
479479
);
480480

481-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
481+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
482482
let Some(nv) = args.name_value() else {
483483
cx.expected_name_value(cx.attr_span, None);
484484
return None;
@@ -551,7 +551,7 @@ impl<S: Stage> SingleAttributeParser<S> for LinkOrdinalParser {
551551
"https://doc.rust-lang.org/reference/items/external-blocks.html#the-link_ordinal-attribute"
552552
);
553553

554-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
554+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
555555
let ordinal = parse_single_integer(cx, args)?;
556556

557557
// According to the table at
@@ -607,7 +607,7 @@ impl<S: Stage> SingleAttributeParser<S> for LinkageParser {
607607
"weak_odr",
608608
]);
609609

610-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
610+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
611611
let Some(name_value) = args.name_value() else {
612612
cx.expected_name_value(cx.attr_span, Some(sym::linkage));
613613
return None;

‎compiler/rustc_attr_parsing/src/attributes/macro_attrs.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ impl<S: Stage> SingleAttributeParser<S> for MacroExportParser {
148148
Error(Target::Crate),
149149
]);
150150

151-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
151+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
152152
let local_inner_macros = match args {
153153
ArgParser::NoArgs => false,
154154
ArgParser::List(list) => {

0 commit comments

Comments
 (0)