Skip to content

Commit 9a23b67

Browse files
mejrsmejrs
committed
Remove more spans from AttributeKind
1 parent 46a6196 commit 9a23b67

45 files changed

Lines changed: 182 additions & 228 deletions

File tree

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/expr.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
10631063
let (binder_clause, generic_params) = self.lower_closure_binder(binder);
10641064

10651065
let (body_id, closure_kind) = self.with_new_scopes(fn_decl_span, move |this| {
1066-
let mut coroutine_kind = find_attr!(attrs, Coroutine(_) => hir::CoroutineKind::Coroutine(Movability::Movable));
1066+
let mut coroutine_kind =
1067+
find_attr!(attrs, Coroutine => hir::CoroutineKind::Coroutine(Movability::Movable));
10671068

10681069
// FIXME(contracts): Support contracts on closures?
10691070
let body_id = this.lower_fn_body(decl, None, |this| {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ pub(crate) struct CoroutineParser;
77
impl NoArgsAttributeParser for CoroutineParser {
88
const PATH: &[Symbol] = &[sym::coroutine];
99
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Closure)]);
10-
const CREATE: fn(rustc_span::Span) -> AttributeKind = |span| AttributeKind::Coroutine(span);
10+
const CREATE: fn(rustc_span::Span) -> AttributeKind = |_| AttributeKind::Coroutine;
1111
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ impl NoArgsAttributeParser for ColdParser {
5454
Allow(Target::ForeignFn),
5555
Allow(Target::Closure),
5656
]);
57-
const CREATE: fn(Span) -> AttributeKind = AttributeKind::Cold;
57+
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::Cold;
5858
}
5959

6060
pub(crate) struct CoverageParser;
@@ -94,7 +94,7 @@ impl SingleAttributeParser for CoverageParser {
9494
}
9595
};
9696

97-
Some(AttributeKind::Coverage(cx.attr_span, kind))
97+
Some(AttributeKind::Coverage(kind))
9898
}
9999
}
100100

@@ -156,7 +156,7 @@ impl SingleAttributeParser for RustcObjcClassParser {
156156
cx.emit_err(NullOnObjcClass { span: nv.value_span });
157157
return None;
158158
}
159-
Some(AttributeKind::RustcObjcClass { classname, span: cx.attr_span })
159+
Some(AttributeKind::RustcObjcClass { classname })
160160
}
161161
}
162162

@@ -183,7 +183,7 @@ impl SingleAttributeParser for RustcObjcSelectorParser {
183183
cx.emit_err(NullOnObjcSelector { span: nv.value_span });
184184
return None;
185185
}
186-
Some(AttributeKind::RustcObjcSelector { methname, span: cx.attr_span })
186+
Some(AttributeKind::RustcObjcSelector { methname })
187187
}
188188
}
189189

@@ -437,9 +437,9 @@ impl AttributeParser for UsedParser {
437437
// If a specific form of `used` is specified, it takes precedence over generic `#[used]`.
438438
// If both `linker` and `compiler` are specified, use `linker`.
439439
Some(match (self.first_compiler, self.first_linker, self.first_default) {
440-
(_, Some(span), _) => AttributeKind::Used { used_by: UsedBy::Linker, span },
441-
(Some(span), _, _) => AttributeKind::Used { used_by: UsedBy::Compiler, span },
442-
(_, _, Some(span)) => AttributeKind::Used { used_by: UsedBy::Default, span },
440+
(_, Some(_), _) => AttributeKind::Used { used_by: UsedBy::Linker },
441+
(Some(_), _, _) => AttributeKind::Used { used_by: UsedBy::Compiler },
442+
(_, _, Some(_)) => AttributeKind::Used { used_by: UsedBy::Default },
443443
(None, None, None) => return None,
444444
})
445445
}

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

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,7 @@ impl SingleAttributeParser for RecursionLimitParser {
8484
fn convert(cx: &mut AcceptContext<'_, '_>, args: &ArgParser) -> Option<AttributeKind> {
8585
let nv = cx.expect_name_value(args, cx.attr_span, None)?;
8686

87-
Some(AttributeKind::RecursionLimit {
88-
limit: cx.parse_limit_int(nv)?,
89-
attr_span: cx.attr_span,
90-
limit_span: nv.value_span,
91-
})
87+
Some(AttributeKind::RecursionLimit { limit: cx.parse_limit_int(nv)? })
9288
}
9389
}
9490

@@ -102,11 +98,7 @@ impl SingleAttributeParser for MoveSizeLimitParser {
10298
fn convert(cx: &mut AcceptContext<'_, '_>, args: &ArgParser) -> Option<AttributeKind> {
10399
let nv = cx.expect_name_value(args, cx.attr_span, None)?;
104100

105-
Some(AttributeKind::MoveSizeLimit {
106-
limit: cx.parse_limit_int(nv)?,
107-
attr_span: cx.attr_span,
108-
limit_span: nv.value_span,
109-
})
101+
Some(AttributeKind::MoveSizeLimit { limit: cx.parse_limit_int(nv)? })
110102
}
111103
}
112104

@@ -121,11 +113,7 @@ impl SingleAttributeParser for TypeLengthLimitParser {
121113
fn convert(cx: &mut AcceptContext<'_, '_>, args: &ArgParser) -> Option<AttributeKind> {
122114
let nv = cx.expect_name_value(args, cx.attr_span, None)?;
123115

124-
Some(AttributeKind::TypeLengthLimit {
125-
limit: cx.parse_limit_int(nv)?,
126-
attr_span: cx.attr_span,
127-
limit_span: nv.value_span,
128-
})
116+
Some(AttributeKind::TypeLengthLimit { limit: cx.parse_limit_int(nv)? })
129117
}
130118
}
131119

@@ -139,11 +127,7 @@ impl SingleAttributeParser for PatternComplexityLimitParser {
139127
fn convert(cx: &mut AcceptContext<'_, '_>, args: &ArgParser) -> Option<AttributeKind> {
140128
let nv = cx.expect_name_value(args, cx.attr_span, None)?;
141129

142-
Some(AttributeKind::PatternComplexityLimit {
143-
limit: cx.parse_limit_int(nv)?,
144-
attr_span: cx.attr_span,
145-
limit_span: nv.value_span,
146-
})
130+
Some(AttributeKind::PatternComplexityLimit { limit: cx.parse_limit_int(nv)? })
147131
}
148132
}
149133

@@ -152,7 +136,7 @@ pub(crate) struct NoCoreParser;
152136
impl NoArgsAttributeParser for NoCoreParser {
153137
const PATH: &[Symbol] = &[sym::no_core];
154138
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Crate)]);
155-
const CREATE: fn(Span) -> AttributeKind = AttributeKind::NoCore;
139+
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::NoCore;
156140
}
157141

158142
pub(crate) struct NoStdParser;
@@ -161,7 +145,7 @@ impl NoArgsAttributeParser for NoStdParser {
161145
const PATH: &[Symbol] = &[sym::no_std];
162146
const ON_DUPLICATE: OnDuplicate = OnDuplicate::Warn;
163147
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Crate)]);
164-
const CREATE: fn(Span) -> AttributeKind = AttributeKind::NoStd;
148+
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::NoStd;
165149
}
166150

167151
pub(crate) struct NoMainParser;
@@ -178,7 +162,7 @@ pub(crate) struct RustcCoherenceIsCoreParser;
178162
impl NoArgsAttributeParser for RustcCoherenceIsCoreParser {
179163
const PATH: &[Symbol] = &[sym::rustc_coherence_is_core];
180164
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Crate)]);
181-
const CREATE: fn(Span) -> AttributeKind = AttributeKind::RustcCoherenceIsCore;
165+
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::RustcCoherenceIsCore;
182166
}
183167

184168
pub(crate) struct WindowsSubsystemParser;
@@ -204,7 +188,7 @@ impl SingleAttributeParser for WindowsSubsystemParser {
204188
}
205189
};
206190

207-
Some(AttributeKind::WindowsSubsystem(kind, cx.attr_span))
191+
Some(AttributeKind::WindowsSubsystem(kind))
208192
}
209193
}
210194

@@ -316,7 +300,7 @@ pub(crate) struct RegisterToolParser;
316300
impl CombineAttributeParser for RegisterToolParser {
317301
const PATH: &[Symbol] = &[sym::register_tool];
318302
type Item = Ident;
319-
const CONVERT: ConvertFn<Self::Item> = AttributeKind::RegisterTool;
303+
const CONVERT: ConvertFn<Self::Item> = |tools, _span| AttributeKind::RegisterTool(tools);
320304
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(ALL_TARGETS);
321305
const TEMPLATE: AttributeTemplate = template!(List: &["tool1, tool2, ..."]);
322306

‎compiler/rustc_attr_parsing/src/attributes/diagnostic/do_not_recommend.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ impl SingleAttributeParser for DoNotRecommendParser {
4040
return None;
4141
}
4242

43-
Some(AttributeKind::DoNotRecommend { attr_span })
43+
Some(AttributeKind::DoNotRecommend)
4444
}
4545
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ impl SingleAttributeParser for LinkSectionParser {
521521
BinaryFormat::Coff | BinaryFormat::Elf | BinaryFormat::Wasm | BinaryFormat::Xcoff => {}
522522
}
523523

524-
Some(LinkSection { name, span: cx.attr_span })
524+
Some(LinkSection { name })
525525
}
526526
}
527527

@@ -537,7 +537,7 @@ impl NoArgsAttributeParser for FfiConstParser {
537537
const PATH: &[Symbol] = &[sym::ffi_const];
538538
const SAFETY: AttributeSafety = AttributeSafety::Unsafe { unsafe_since: None };
539539
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::ForeignFn)]);
540-
const CREATE: fn(Span) -> AttributeKind = AttributeKind::FfiConst;
540+
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::FfiConst;
541541
}
542542

543543
pub(crate) struct FfiPureParser;
@@ -557,7 +557,7 @@ impl NoArgsAttributeParser for RustcStdInternalSymbolParser {
557557
Allow(Target::Static),
558558
Allow(Target::ForeignStatic),
559559
]);
560-
const CREATE: fn(Span) -> AttributeKind = AttributeKind::RustcStdInternalSymbol;
560+
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::RustcStdInternalSymbol;
561561
}
562562

563563
pub(crate) struct LinkOrdinalParser;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ impl NoArgsAttributeParser for RustcAsPtrParser {
1010
Allow(Target::Method(MethodKind::Trait { body: true })),
1111
Allow(Target::Method(MethodKind::TraitImpl)),
1212
]);
13-
const CREATE: fn(Span) -> AttributeKind = AttributeKind::RustcAsPtr;
13+
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::RustcAsPtr;
1414
}
1515

1616
pub(crate) struct RustcPubTransparentParser;
@@ -32,7 +32,7 @@ impl NoArgsAttributeParser for RustcPassByValueParser {
3232
Allow(Target::Enum),
3333
Allow(Target::TyAlias),
3434
]);
35-
const CREATE: fn(Span) -> AttributeKind = AttributeKind::RustcPassByValue;
35+
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::RustcPassByValue;
3636
}
3737

3838
pub(crate) struct RustcShouldNotBeCalledOnConstItemsParser;
@@ -42,7 +42,7 @@ impl NoArgsAttributeParser for RustcShouldNotBeCalledOnConstItemsParser {
4242
Allow(Target::Method(MethodKind::Inherent)),
4343
Allow(Target::Method(MethodKind::TraitImpl)),
4444
]);
45-
const CREATE: fn(Span) -> AttributeKind = AttributeKind::RustcShouldNotBeCalledOnConstItems;
45+
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::RustcShouldNotBeCalledOnConstItems;
4646
}
4747

4848
pub(crate) struct AutomaticallyDerivedParser;
@@ -54,5 +54,5 @@ impl NoArgsAttributeParser for AutomaticallyDerivedParser {
5454
Error(Target::Crate),
5555
Error(Target::WherePredicate),
5656
]);
57-
const CREATE: fn(Span) -> AttributeKind = AttributeKind::AutomaticallyDerived;
57+
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::AutomaticallyDerived;
5858
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ impl NoArgsAttributeParser for MacroEscapeParser {
88
const PATH: &[Symbol] = &[sym::macro_escape];
99
const ON_DUPLICATE: OnDuplicate = OnDuplicate::Warn;
1010
const ALLOWED_TARGETS: AllowedTargets = MACRO_USE_ALLOWED_TARGETS;
11-
const CREATE: fn(Span) -> AttributeKind = AttributeKind::MacroEscape;
11+
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::MacroEscape;
1212
}
1313

1414
/// `#[macro_use]` attributes can either:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ impl NoArgsAttributeParser for NoImplicitPreludeParser {
77
const ON_DUPLICATE: OnDuplicate = OnDuplicate::Warn;
88
const ALLOWED_TARGETS: AllowedTargets =
99
AllowedTargets::AllowListWarnRest(&[Allow(Target::Mod), Allow(Target::Crate)]);
10-
const CREATE: fn(Span) -> AttributeKind = AttributeKind::NoImplicitPrelude;
10+
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::NoImplicitPrelude;
1111
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ impl SingleAttributeParser for PathParser {
1919
return None;
2020
};
2121

22-
Some(AttributeKind::Path(path, cx.attr_span))
22+
Some(AttributeKind::Path(path))
2323
}
2424
}

0 commit comments

Comments
 (0)