Skip to content

Commit 0424cc1

Browse files
borsbors
committed
Auto merge of rust-lang#155775 - JonathanBrouwer:cleanup_stage, r=jdonszelmann,petrochenkov
Remove attribute parsing `Stage` I discovered that it is surprisingly easy to remove the concept of `Stage` in the attribute parsers, imo this makes the code a lot cleaner. r? @jdonszelmann cc @mejrs @Bryntet
2 parents 4f9e4e1 + 08babc8 commit 0424cc1

57 files changed

Lines changed: 580 additions & 741 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎compiler/rustc_ast_lowering/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ use std::sync::Arc;
4141
use rustc_ast::node_id::NodeMap;
4242
use rustc_ast::visit::Visitor;
4343
use rustc_ast::{self as ast, *};
44-
use rustc_attr_parsing::{AttributeParser, Late, OmitDoc};
44+
use rustc_attr_parsing::{AttributeParser, OmitDoc, Recovery, ShouldEmit};
4545
use rustc_data_structures::fingerprint::Fingerprint;
4646
use rustc_data_structures::fx::FxIndexSet;
4747
use rustc_data_structures::sorted_map::SortedMap;
@@ -221,7 +221,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
221221
tcx.sess,
222222
tcx.features(),
223223
registered_tools,
224-
Late,
224+
ShouldEmit::ErrorsAndLints { recovery: Recovery::Allowed },
225225
),
226226
delayed_lints: Vec::new(),
227227
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use super::prelude::*;
44
use crate::session_diagnostics;
55

66
pub(crate) struct AllowInternalUnstableParser;
7-
impl<S: Stage> CombineAttributeParser<S> for AllowInternalUnstableParser {
7+
impl CombineAttributeParser for AllowInternalUnstableParser {
88
const PATH: &[Symbol] = &[sym::allow_internal_unstable];
99
type Item = (Symbol, Span);
1010
const CONVERT: ConvertFn<Self::Item> =
@@ -18,17 +18,17 @@ impl<S: Stage> CombineAttributeParser<S> for AllowInternalUnstableParser {
1818
const TEMPLATE: AttributeTemplate = template!(Word, List: &["feat1, feat2, ..."]);
1919

2020
fn extend(
21-
cx: &mut AcceptContext<'_, '_, S>,
21+
cx: &mut AcceptContext<'_, '_>,
2222
args: &ArgParser,
2323
) -> impl IntoIterator<Item = Self::Item> {
24-
parse_unstable(cx, args, <Self as CombineAttributeParser<S>>::PATH[0])
24+
parse_unstable(cx, args, <Self as CombineAttributeParser>::PATH[0])
2525
.into_iter()
2626
.zip(iter::repeat(cx.attr_span))
2727
}
2828
}
2929

3030
pub(crate) struct UnstableFeatureBoundParser;
31-
impl<S: Stage> CombineAttributeParser<S> for UnstableFeatureBoundParser {
31+
impl CombineAttributeParser for UnstableFeatureBoundParser {
3232
const PATH: &[rustc_span::Symbol] = &[sym::unstable_feature_bound];
3333
type Item = (Symbol, Span);
3434
const CONVERT: ConvertFn<Self::Item> = |items, _| AttributeKind::UnstableFeatureBound(items);
@@ -40,20 +40,20 @@ impl<S: Stage> CombineAttributeParser<S> for UnstableFeatureBoundParser {
4040
const TEMPLATE: AttributeTemplate = template!(Word, List: &["feat1, feat2, ..."]);
4141

4242
fn extend(
43-
cx: &mut AcceptContext<'_, '_, S>,
43+
cx: &mut AcceptContext<'_, '_>,
4444
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 });
4848
}
49-
parse_unstable(cx, args, <Self as CombineAttributeParser<S>>::PATH[0])
49+
parse_unstable(cx, args, <Self as CombineAttributeParser>::PATH[0])
5050
.into_iter()
5151
.zip(iter::repeat(cx.attr_span))
5252
}
5353
}
5454

5555
pub(crate) struct RustcAllowConstFnUnstableParser;
56-
impl<S: Stage> CombineAttributeParser<S> for RustcAllowConstFnUnstableParser {
56+
impl CombineAttributeParser for RustcAllowConstFnUnstableParser {
5757
const PATH: &[Symbol] = &[sym::rustc_allow_const_fn_unstable];
5858
type Item = Symbol;
5959
const CONVERT: ConvertFn<Self::Item> =
@@ -67,15 +67,15 @@ impl<S: Stage> CombineAttributeParser<S> for RustcAllowConstFnUnstableParser {
6767
const TEMPLATE: AttributeTemplate = template!(Word, List: &["feat1, feat2, ..."]);
6868

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

77-
fn parse_unstable<S: Stage>(
78-
cx: &AcceptContext<'_, '_, S>,
77+
fn parse_unstable(
78+
cx: &AcceptContext<'_, '_>,
7979
args: &ArgParser,
8080
symbol: Symbol,
8181
) -> impl IntoIterator<Item = Symbol> {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ use thin_vec::ThinVec;
1010

1111
use crate::attributes::SingleAttributeParser;
1212
use crate::attributes::prelude::Allow;
13-
use crate::context::{AcceptContext, Stage};
13+
use crate::context::AcceptContext;
1414
use crate::parser::{ArgParser, MetaItemOrLitParser};
1515
use crate::target_checking::AllowedTargets;
1616

1717
pub(crate) struct RustcAutodiffParser;
1818

19-
impl<S: Stage> SingleAttributeParser<S> for RustcAutodiffParser {
19+
impl SingleAttributeParser for RustcAutodiffParser {
2020
const PATH: &[Symbol] = &[sym::rustc_autodiff];
2121
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[
2222
Allow(Target::Fn),
@@ -30,7 +30,7 @@ impl<S: Stage> SingleAttributeParser<S> for RustcAutodiffParser {
3030
"https://doc.rust-lang.org/std/autodiff/index.html"
3131
);
3232

33-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
33+
fn convert(cx: &mut AcceptContext<'_, '_>, args: &ArgParser) -> Option<AttributeKind> {
3434
let list = match args {
3535
ArgParser::NoArgs => return Some(AttributeKind::RustcAutodiff(None)),
3636
ArgParser::List(list) => list,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use super::prelude::*;
44

55
pub(crate) struct CoroutineParser;
66

7-
impl<S: Stage> NoArgsAttributeParser<S> for CoroutineParser {
7+
impl NoArgsAttributeParser for CoroutineParser {
88
const PATH: &[Symbol] = &[sym::coroutine];
99
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Closure)]);
1010
const CREATE: fn(rustc_span::Span) -> AttributeKind = |span| AttributeKind::Coroutine(span);

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use thin_vec::ThinVec;
2020

2121
use crate::attributes::AttributeSafety;
2222
use crate::attributes::diagnostic::check_cfg;
23-
use crate::context::{AcceptContext, ShouldEmit, Stage};
23+
use crate::context::{AcceptContext, ShouldEmit};
2424
use crate::parser::{
2525
AllowExprMetavar, ArgParser, MetaItemListParser, MetaItemOrLitParser, NameValueParser,
2626
};
@@ -40,10 +40,7 @@ const CFG_ATTR_TEMPLATE: AttributeTemplate = template!(
4040
"https://doc.rust-lang.org/reference/conditional-compilation.html#the-cfg_attr-attribute"
4141
);
4242

43-
pub fn parse_cfg<S: Stage>(
44-
cx: &mut AcceptContext<'_, '_, S>,
45-
args: &ArgParser,
46-
) -> Option<CfgEntry> {
43+
pub fn parse_cfg(cx: &mut AcceptContext<'_, '_>, args: &ArgParser) -> Option<CfgEntry> {
4744
let list = cx.expect_list(args, cx.attr_span)?;
4845

4946
let Some(single) = list.as_single() else {
@@ -81,8 +78,8 @@ pub fn parse_cfg<S: Stage>(
8178
parse_cfg_entry(cx, single).ok()
8279
}
8380

84-
pub fn parse_cfg_entry<S: Stage>(
85-
cx: &mut AcceptContext<'_, '_, S>,
81+
pub fn parse_cfg_entry(
82+
cx: &mut AcceptContext<'_, '_>,
8683
item: &MetaItemOrLitParser,
8784
) -> Result<CfgEntry, ErrorGuaranteed> {
8885
Ok(match item {
@@ -126,8 +123,8 @@ pub fn parse_cfg_entry<S: Stage>(
126123
})
127124
}
128125

129-
fn parse_cfg_entry_version<S: Stage>(
130-
cx: &mut AcceptContext<'_, '_, S>,
126+
fn parse_cfg_entry_version(
127+
cx: &mut AcceptContext<'_, '_>,
131128
list: &MetaItemListParser,
132129
meta_span: Span,
133130
) -> Result<CfgEntry, ErrorGuaranteed> {
@@ -158,8 +155,8 @@ fn parse_cfg_entry_version<S: Stage>(
158155
Ok(CfgEntry::Version(min_version, list.span))
159156
}
160157

161-
fn parse_cfg_entry_target<S: Stage>(
162-
cx: &mut AcceptContext<'_, '_, S>,
158+
fn parse_cfg_entry_target(
159+
cx: &mut AcceptContext<'_, '_>,
163160
list: &MetaItemListParser,
164161
meta_span: Span,
165162
) -> Result<CfgEntry, ErrorGuaranteed> {
@@ -201,12 +198,12 @@ fn parse_cfg_entry_target<S: Stage>(
201198
Ok(CfgEntry::All(result, list.span))
202199
}
203200

204-
pub(crate) fn parse_name_value<S: Stage>(
201+
pub(crate) fn parse_name_value(
205202
name: Symbol,
206203
name_span: Span,
207204
value: Option<&NameValueParser>,
208205
span: Span,
209-
cx: &mut AcceptContext<'_, '_, S>,
206+
cx: &mut AcceptContext<'_, '_>,
210207
) -> Result<CfgEntry, ErrorGuaranteed> {
211208
try_gate_cfg(name, span, cx.sess(), cx.features_option());
212209

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::prelude::*;
22
pub(crate) struct CfiEncodingParser;
3-
impl<S: Stage> SingleAttributeParser<S> for CfiEncodingParser {
3+
impl SingleAttributeParser for CfiEncodingParser {
44
const PATH: &[Symbol] = &[sym::cfi_encoding];
55
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowListWarnRest(&[
66
Allow(Target::Struct),
@@ -10,7 +10,7 @@ impl<S: Stage> SingleAttributeParser<S> for CfiEncodingParser {
1010
]);
1111
const TEMPLATE: AttributeTemplate = template!(NameValueStr: "encoding");
1212

13-
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
13+
fn convert(cx: &mut AcceptContext<'_, '_>, args: &ArgParser) -> Option<AttributeKind> {
1414
let Some(name_value) = args.name_value() else {
1515
let attr_span = cx.attr_span;
1616
cx.adcx().expected_name_value(attr_span, Some(sym::cfi_encoding));

0 commit comments

Comments
 (0)