Skip to content

Commit 33f4a3d

Browse files
committed
Auto merge of #152364 - jdonszelmann:port-a-lot, r=jonathanbrouwer
Port a lot of attributes to the new parser r? @JonathanBrouwer See commits for which attributes
2 parents f21b4c0 + 12dbc1b commit 33f4a3d

File tree

23 files changed

+564
-288
lines changed

23 files changed

+564
-288
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3687,7 +3687,6 @@ dependencies = [
36873687
"serde_json",
36883688
"smallvec",
36893689
"tempfile",
3690-
"thin-vec",
36913690
"thorin-dwp",
36923691
"tracing",
36933692
"wasm-encoder 0.219.2",

compiler/rustc_attr_parsing/src/attributes/allow_unstable.rs

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

3030
pub(crate) struct UnstableFeatureBoundParser;
3131
impl<S: Stage> CombineAttributeParser<S> for UnstableFeatureBoundParser {
32-
const PATH: &'static [rustc_span::Symbol] = &[sym::unstable_feature_bound];
32+
const PATH: &[rustc_span::Symbol] = &[sym::unstable_feature_bound];
3333
type Item = (Symbol, Span);
3434
const CONVERT: ConvertFn<Self::Item> = |items, _| AttributeKind::UnstableFeatureBound(items);
3535
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[

compiler/rustc_attr_parsing/src/attributes/inline.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::prelude::*;
1010
pub(crate) struct InlineParser;
1111

1212
impl<S: Stage> SingleAttributeParser<S> for InlineParser {
13-
const PATH: &'static [Symbol] = &[sym::inline];
13+
const PATH: &[Symbol] = &[sym::inline];
1414
const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepOutermost;
1515
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::WarnButFutureError;
1616
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[
@@ -67,7 +67,7 @@ impl<S: Stage> SingleAttributeParser<S> for InlineParser {
6767
pub(crate) struct RustcForceInlineParser;
6868

6969
impl<S: Stage> SingleAttributeParser<S> for RustcForceInlineParser {
70-
const PATH: &'static [Symbol] = &[sym::rustc_force_inline];
70+
const PATH: &[Symbol] = &[sym::rustc_force_inline];
7171
const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepOutermost;
7272
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::WarnButFutureError;
7373
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[

compiler/rustc_attr_parsing/src/attributes/repr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ fn parse_alignment(node: &LitKind) -> Result<Align, &'static str> {
272272
pub(crate) struct AlignParser(Option<(Align, Span)>);
273273

274274
impl AlignParser {
275-
const PATH: &'static [Symbol] = &[sym::rustc_align];
275+
const PATH: &[Symbol] = &[sym::rustc_align];
276276
const TEMPLATE: AttributeTemplate = template!(List: &["<alignment in bytes>"]);
277277

278278
fn parse<S: Stage>(&mut self, cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) {
@@ -329,7 +329,7 @@ impl<S: Stage> AttributeParser<S> for AlignParser {
329329
pub(crate) struct AlignStaticParser(AlignParser);
330330

331331
impl AlignStaticParser {
332-
const PATH: &'static [Symbol] = &[sym::rustc_align_static];
332+
const PATH: &[Symbol] = &[sym::rustc_align_static];
333333
const TEMPLATE: AttributeTemplate = AlignParser::TEMPLATE;
334334

335335
fn parse<S: Stage>(&mut self, cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) {

0 commit comments

Comments
 (0)