Skip to content

Commit 20cec77

Browse files
Provide a mutable reference of FinalizeContext to finalize
Signed-off-by: Jonathan Brouwer <jonathantbrouwer@gmail.com>
1 parent 75ba73d commit 20cec77

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

compiler/rustc_attr_parsing/src/attributes/codegen_attrs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ impl<S: Stage> AttributeParser<S> for NakedParser {
100100
}
101101
})];
102102

103-
fn finalize(self, cx: &FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
103+
fn finalize(self, cx: &mut FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
104104
// FIXME(jdonszelmann): upgrade this list to *parsed* attributes
105105
// once all of these have parsed forms. That'd make the check much nicer...
106106
//
@@ -271,7 +271,7 @@ impl<S: Stage> AttributeParser<S> for UsedParser {
271271
},
272272
)];
273273

274-
fn finalize(self, _cx: &FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
274+
fn finalize(self, _cx: &mut FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
275275
// Ratcheting behaviour, if both `linker` and `compiler` are specified, use `linker`
276276
Some(match (self.first_compiler, self.first_linker) {
277277
(_, Some(span)) => AttributeKind::Used { used_by: UsedBy::Linker, span },

compiler/rustc_attr_parsing/src/attributes/confusables.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl<S: Stage> AttributeParser<S> for ConfusablesParser {
4242
},
4343
)];
4444

45-
fn finalize(self, _cx: &FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
45+
fn finalize(self, _cx: &mut FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
4646
if self.confusables.is_empty() {
4747
return None;
4848
}

compiler/rustc_attr_parsing/src/attributes/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ pub(crate) trait AttributeParser<S: Stage>: Default + 'static {
8484
/// that'd be equivalent to unconditionally applying an attribute to
8585
/// every single syntax item that could have attributes applied to it.
8686
/// Your accept mappings should determine whether this returns something.
87-
fn finalize(self, cx: &FinalizeContext<'_, '_, S>) -> Option<AttributeKind>;
87+
fn finalize(self, cx: &mut FinalizeContext<'_, '_, S>) -> Option<AttributeKind>;
8888
}
8989

9090
/// Alternative to [`AttributeParser`] that automatically handles state management.
@@ -160,7 +160,7 @@ impl<T: SingleAttributeParser<S>, S: Stage> AttributeParser<S> for Single<T, S>
160160
},
161161
)];
162162

163-
fn finalize(self, _cx: &FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
163+
fn finalize(self, _cx: &mut FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
164164
Some(self.1?.0)
165165
}
166166
}
@@ -330,7 +330,7 @@ impl<T: CombineAttributeParser<S>, S: Stage> AttributeParser<S> for Combine<T, S
330330
},
331331
)];
332332

333-
fn finalize(self, _cx: &FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
333+
fn finalize(self, _cx: &mut FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
334334
if let Some(first_span) = self.first_span {
335335
Some(T::CONVERT(self.items, first_span))
336336
} else {

compiler/rustc_attr_parsing/src/attributes/must_use.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl<S: Stage> SingleAttributeParser<S> for MustUseParser {
3434
ArgParser::List(_) => {
3535
let suggestions =
3636
<Self as SingleAttributeParser<S>>::TEMPLATE.suggestions(false, "must_use");
37-
cx.emit_err(session_diagnostics::MustUseIllFormedAttributeInput {
37+
cx.emit_err(session_diagnostics::IllFormedAttributeInputLint {
3838
num_suggestions: suggestions.len(),
3939
suggestions: DiagArgValue::StrListSepByAnd(
4040
suggestions.into_iter().map(|s| format!("`{s}`").into()).collect(),

compiler/rustc_attr_parsing/src/attributes/repr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ impl AlignParser {
317317
impl<S: Stage> AttributeParser<S> for AlignParser {
318318
const ATTRIBUTES: AcceptMapping<Self, S> = &[(Self::PATH, Self::TEMPLATE, Self::parse)];
319319

320-
fn finalize(self, _cx: &FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
320+
fn finalize(self, _cx: &mut FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
321321
let (align, span) = self.0?;
322322
Some(AttributeKind::Align { align, span })
323323
}

compiler/rustc_attr_parsing/src/attributes/stability.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl<S: Stage> AttributeParser<S> for StabilityParser {
8080
),
8181
];
8282

83-
fn finalize(mut self, cx: &FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
83+
fn finalize(mut self, cx: &mut FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
8484
if let Some(atum) = self.allowed_through_unstable_modules {
8585
if let Some((
8686
Stability {
@@ -125,7 +125,7 @@ impl<S: Stage> AttributeParser<S> for BodyStabilityParser {
125125
},
126126
)];
127127

128-
fn finalize(self, _cx: &FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
128+
fn finalize(self, _cx: &mut FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
129129
let (stability, span) = self.stability?;
130130

131131
Some(AttributeKind::BodyStability { stability, span })
@@ -188,7 +188,7 @@ impl<S: Stage> AttributeParser<S> for ConstStabilityParser {
188188
}),
189189
];
190190

191-
fn finalize(mut self, cx: &FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
191+
fn finalize(mut self, cx: &mut FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
192192
if self.promotable {
193193
if let Some((ref mut stab, _)) = self.stability {
194194
stab.promotable = true;

0 commit comments

Comments
 (0)