Skip to content

Commit 12dbc1b

Browse files
jdonszelmannjdonszelmann
committed
remove 'static in many places
1 parent fe7530c commit 12dbc1b

5 files changed

Lines changed: 10 additions & 28 deletions

File tree

‎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) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use crate::session_diagnostics::{
1818
pub(crate) struct RustcMainParser;
1919

2020
impl<S: Stage> NoArgsAttributeParser<S> for RustcMainParser {
21-
const PATH: &'static [Symbol] = &[sym::rustc_main];
21+
const PATH: &[Symbol] = &[sym::rustc_main];
2222
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
2323
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Fn)]);
2424
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::RustcMain;
@@ -103,7 +103,7 @@ impl<S: Stage> NoArgsAttributeParser<S> for RustcNoImplicitAutorefsParser {
103103
pub(crate) struct RustcLayoutScalarValidRangeStartParser;
104104

105105
impl<S: Stage> SingleAttributeParser<S> for RustcLayoutScalarValidRangeStartParser {
106-
const PATH: &'static [Symbol] = &[sym::rustc_layout_scalar_valid_range_start];
106+
const PATH: &[Symbol] = &[sym::rustc_layout_scalar_valid_range_start];
107107
const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepInnermost;
108108
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
109109
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Struct)]);
@@ -118,7 +118,7 @@ impl<S: Stage> SingleAttributeParser<S> for RustcLayoutScalarValidRangeStartPars
118118
pub(crate) struct RustcLayoutScalarValidRangeEndParser;
119119

120120
impl<S: Stage> SingleAttributeParser<S> for RustcLayoutScalarValidRangeEndParser {
121-
const PATH: &'static [Symbol] = &[sym::rustc_layout_scalar_valid_range_end];
121+
const PATH: &[Symbol] = &[sym::rustc_layout_scalar_valid_range_end];
122122
const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepInnermost;
123123
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
124124
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Struct)]);
@@ -822,7 +822,7 @@ impl<S: Stage> CombineAttributeParser<S> for RustcMirParser {
822822
pub(crate) struct RustcNonConstTraitMethodParser;
823823

824824
impl<S: Stage> NoArgsAttributeParser<S> for RustcNonConstTraitMethodParser {
825-
const PATH: &'static [Symbol] = &[sym::rustc_non_const_trait_method];
825+
const PATH: &[Symbol] = &[sym::rustc_non_const_trait_method];
826826
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
827827
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[
828828
Allow(Target::Method(MethodKind::Trait { body: true })),
@@ -1067,7 +1067,7 @@ impl<S: Stage> NoArgsAttributeParser<S> for RustcInsignificantDtorParser {
10671067
pub(crate) struct RustcEffectiveVisibilityParser;
10681068

10691069
impl<S: Stage> NoArgsAttributeParser<S> for RustcEffectiveVisibilityParser {
1070-
const PATH: &'static [Symbol] = &[sym::rustc_effective_visibility];
1070+
const PATH: &[Symbol] = &[sym::rustc_effective_visibility];
10711071
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
10721072
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[
10731073
Allow(Target::Use),

‎compiler/rustc_attr_parsing/src/context.rs‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ attribute_parsers!(
211211
Single<RustcLintOptDenyFieldAccessParser>,
212212
Single<RustcMustImplementOneOfParser>,
213213
Single<RustcNeverTypeOptionsParser>,
214-
Single<RustcNeverTypeOptionsParser>,
215214
Single<RustcReservationImplParser>,
216215
Single<RustcScalableVectorParser>,
217216
Single<RustcSimdMonomorphizeLaneLimitParser>,
@@ -300,30 +299,13 @@ attribute_parsers!(
300299
Single<WithoutArgs<RustcRegionsParser>>,
301300
Single<WithoutArgs<RustcShouldNotBeCalledOnConstItems>>,
302301
Single<WithoutArgs<RustcStrictCoherenceParser>>,
303-
Single<WithoutArgs<RustcStrictCoherenceParser>>,
304-
Single<WithoutArgs<RustcStrictCoherenceParser>>,
305302
Single<WithoutArgs<RustcTrivialFieldReadsParser>>,
306-
Single<WithoutArgs<RustcTrivialFieldReadsParser>>,
307-
Single<WithoutArgs<RustcVarianceOfOpaquesParser>>,
308303
Single<WithoutArgs<RustcVarianceOfOpaquesParser>>,
309-
Single<WithoutArgs<RustcVarianceOfOpaquesParser>>,
310-
Single<WithoutArgs<RustcVarianceParser>>,
311304
Single<WithoutArgs<RustcVarianceParser>>,
312-
Single<WithoutArgs<RustcVarianceParser>>,
313-
Single<WithoutArgs<SpecializationTraitParser>>,
314305
Single<WithoutArgs<SpecializationTraitParser>>,
315-
Single<WithoutArgs<SpecializationTraitParser>>,
316-
Single<WithoutArgs<StdInternalSymbolParser>>,
317-
Single<WithoutArgs<StdInternalSymbolParser>>,
318306
Single<WithoutArgs<StdInternalSymbolParser>>,
319307
Single<WithoutArgs<ThreadLocalParser>>,
320-
Single<WithoutArgs<ThreadLocalParser>>,
321-
Single<WithoutArgs<ThreadLocalParser>>,
322308
Single<WithoutArgs<TrackCallerParser>>,
323-
Single<WithoutArgs<TrackCallerParser>>,
324-
Single<WithoutArgs<TrackCallerParser>>,
325-
Single<WithoutArgs<UnsafeSpecializationMarkerParser>>,
326-
Single<WithoutArgs<UnsafeSpecializationMarkerParser>>,
327309
Single<WithoutArgs<UnsafeSpecializationMarkerParser>>,
328310
// tidy-alphabetical-end
329311
];

0 commit comments

Comments
 (0)