Skip to content

Commit 5c661ae

Browse files
JonathanBrouwerJonathanBrouwer
committed
Remove lifetime param from parser functions
1 parent c1c7262 commit 5c661ae

7 files changed

Lines changed: 43 additions & 43 deletions

File tree

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ impl<S: Stage> CombineAttributeParser<S> for AllowInternalUnstableParser {
1717
]);
1818
const TEMPLATE: AttributeTemplate = template!(Word, List: &["feat1, feat2, ..."]);
1919

20-
fn extend<'c>(
21-
cx: &'c mut AcceptContext<'_, '_, S>,
22-
args: &'c ArgParser,
20+
fn extend(
21+
cx: &mut AcceptContext<'_, '_, S>,
22+
args: &ArgParser,
2323
) -> impl IntoIterator<Item = Self::Item> {
2424
parse_unstable(cx, args, <Self as CombineAttributeParser<S>>::PATH[0])
2525
.into_iter()
@@ -39,9 +39,9 @@ impl<S: Stage> CombineAttributeParser<S> for UnstableFeatureBoundParser {
3939
]);
4040
const TEMPLATE: AttributeTemplate = template!(Word, List: &["feat1, feat2, ..."]);
4141

42-
fn extend<'c>(
43-
cx: &'c mut AcceptContext<'_, '_, S>,
44-
args: &'c ArgParser,
42+
fn extend(
43+
cx: &mut AcceptContext<'_, '_, S>,
44+
args: &ArgParser,
4545
) -> impl IntoIterator<Item = Self::Item> {
4646
if !cx.features().staged_api() {
4747
cx.emit_err(session_diagnostics::StabilityOutsideStd { span: cx.attr_span });
@@ -67,10 +67,10 @@ impl<S: Stage> CombineAttributeParser<S> for AllowConstFnUnstableParser {
6767
]);
6868
const TEMPLATE: AttributeTemplate = template!(Word, List: &["feat1, feat2, ..."]);
6969

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ const CFG_ATTR_TEMPLATE: AttributeTemplate = template!(
3838
"https://doc.rust-lang.org/reference/conditional-compilation.html#the-cfg_attr-attribute"
3939
);
4040

41-
pub fn parse_cfg<'c, S: Stage>(
42-
cx: &'c mut AcceptContext<'_, '_, S>,
43-
args: &'c ArgParser,
41+
pub fn parse_cfg<S: Stage>(
42+
cx: &mut AcceptContext<'_, '_, S>,
43+
args: &ArgParser,
4444
) -> Option<CfgEntry> {
4545
let ArgParser::List(list) = args else {
4646
cx.expected_list(cx.attr_span);

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -472,10 +472,10 @@ impl<S: Stage> AttributeParser<S> for UsedParser {
472472
}
473473
}
474474

475-
fn parse_tf_attribute<'c, S: Stage>(
476-
cx: &'c mut AcceptContext<'_, '_, S>,
477-
args: &'c ArgParser,
478-
) -> impl IntoIterator<Item = (Symbol, Span)> + 'c {
475+
fn parse_tf_attribute<S: Stage>(
476+
cx: &mut AcceptContext<'_, '_, S>,
477+
args: &ArgParser,
478+
) -> impl IntoIterator<Item = (Symbol, Span)> {
479479
let mut features = Vec::new();
480480
let ArgParser::List(list) = args else {
481481
cx.expected_list(cx.attr_span);
@@ -529,10 +529,10 @@ impl<S: Stage> CombineAttributeParser<S> for TargetFeatureParser {
529529
};
530530
const TEMPLATE: AttributeTemplate = template!(List: &["enable = \"feat1, feat2\""]);
531531

532-
fn extend<'c>(
533-
cx: &'c mut AcceptContext<'_, '_, S>,
534-
args: &'c ArgParser,
535-
) -> impl IntoIterator<Item = Self::Item> + 'c {
532+
fn extend(
533+
cx: &mut AcceptContext<'_, '_, S>,
534+
args: &ArgParser,
535+
) -> impl IntoIterator<Item = Self::Item> {
536536
parse_tf_attribute(cx, args)
537537
}
538538

@@ -567,10 +567,10 @@ impl<S: Stage> CombineAttributeParser<S> for ForceTargetFeatureParser {
567567
Allow(Target::Method(MethodKind::TraitImpl)),
568568
]);
569569

570-
fn extend<'c>(
571-
cx: &'c mut AcceptContext<'_, '_, S>,
572-
args: &'c ArgParser,
573-
) -> impl IntoIterator<Item = Self::Item> + 'c {
570+
fn extend(
571+
cx: &mut AcceptContext<'_, '_, S>,
572+
args: &ArgParser,
573+
) -> impl IntoIterator<Item = Self::Item> {
574574
parse_tf_attribute(cx, args)
575575
}
576576
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ impl<S: Stage> CombineAttributeParser<S> for DebuggerViualizerParser {
1616
type Item = DebugVisualizer;
1717
const CONVERT: ConvertFn<Self::Item> = |v, _| AttributeKind::DebuggerVisualizer(v);
1818

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ impl<S: Stage> CombineAttributeParser<S> for LinkParser {
6262
], "https://doc.rust-lang.org/reference/items/external-blocks.html#the-link-attribute");
6363
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(ALL_TARGETS); //FIXME Still checked fully in `check_attr.rs`
6464

65-
fn extend<'c>(
66-
cx: &'c mut AcceptContext<'_, '_, S>,
67-
args: &'c ArgParser,
68-
) -> impl IntoIterator<Item = Self::Item> + 'c {
65+
fn extend(
66+
cx: &mut AcceptContext<'_, '_, S>,
67+
args: &ArgParser,
68+
) -> impl IntoIterator<Item = Self::Item> {
6969
let items = match args {
7070
ArgParser::List(list) => list,
7171
// This is an edgecase added because making this a hard error would break too many crates

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,10 @@ pub(crate) trait CombineAttributeParser<S: Stage>: 'static {
314314
const TEMPLATE: AttributeTemplate;
315315

316316
/// Converts a single syntactical attribute to a number of elements of the semantic attribute, or [`AttributeKind`]
317-
fn extend<'c>(
318-
cx: &'c mut AcceptContext<'_, '_, S>,
319-
args: &'c ArgParser,
320-
) -> impl IntoIterator<Item = Self::Item> + 'c;
317+
fn extend(
318+
cx: &mut AcceptContext<'_, '_, S>,
319+
args: &ArgParser,
320+
) -> impl IntoIterator<Item = Self::Item>;
321321
}
322322

323323
/// Use in combination with [`CombineAttributeParser`].

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ impl<S: Stage> CombineAttributeParser<S> for ReprParser {
2626
"https://doc.rust-lang.org/reference/type-layout.html#representations"
2727
);
2828

29-
fn extend<'c>(
30-
cx: &'c mut AcceptContext<'_, '_, S>,
31-
args: &'c ArgParser,
32-
) -> impl IntoIterator<Item = Self::Item> + 'c {
29+
fn extend(
30+
cx: &mut AcceptContext<'_, '_, S>,
31+
args: &ArgParser,
32+
) -> impl IntoIterator<Item = Self::Item> {
3333
let mut reprs = Vec::new();
3434

3535
let Some(list) = args.list() else {
@@ -275,7 +275,7 @@ impl AlignParser {
275275
const PATH: &'static [Symbol] = &[sym::rustc_align];
276276
const TEMPLATE: AttributeTemplate = template!(List: &["<alignment in bytes>"]);
277277

278-
fn parse<'c, S: Stage>(&mut self, cx: &'c mut AcceptContext<'_, '_, S>, args: &'c ArgParser) {
278+
fn parse<S: Stage>(&mut self, cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) {
279279
match args {
280280
ArgParser::NoArgs | ArgParser::NameValue(_) => {
281281
cx.expected_list(cx.attr_span);
@@ -332,7 +332,7 @@ impl AlignStaticParser {
332332
const PATH: &'static [Symbol] = &[sym::rustc_align_static];
333333
const TEMPLATE: AttributeTemplate = AlignParser::TEMPLATE;
334334

335-
fn parse<'c, S: Stage>(&mut self, cx: &'c mut AcceptContext<'_, '_, S>, args: &'c ArgParser) {
335+
fn parse<S: Stage>(&mut self, cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) {
336336
self.0.parse(cx, args)
337337
}
338338
}

0 commit comments

Comments
 (0)