Skip to content

Commit

Permalink
Suppress some fallout from gen in synstructure
Browse files Browse the repository at this point in the history
  • Loading branch information
compiler-errors committed Jul 14, 2024
1 parent dc20733 commit f08c43a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions compiler/rustc_macros/src/diagnostics/diagnostic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ impl<'a> DiagnosticDerive<'a> {
});

// A lifetime of `'a` causes conflicts, but `_sess` is fine.
// FIXME(edition_2024): Fix the `keyword_idents_2024` lint to not trigger here?
#[allow(keyword_idents_2024)]
let mut imp = structure.gen_impl(quote! {
gen impl<'_sess, G> rustc_errors::Diagnostic<'_sess, G> for @Self
where G: rustc_errors::EmissionGuarantee
Expand Down Expand Up @@ -148,6 +150,8 @@ impl<'a> LintDiagnosticDerive<'a> {
}
});

// FIXME(edition_2024): Fix the `keyword_idents_2024` lint to not trigger here?
#[allow(keyword_idents_2024)]
let mut imp = structure.gen_impl(quote! {
gen impl<'__a> rustc_errors::LintDiagnostic<'__a, ()> for @Self {
#[track_caller]
Expand Down
4 changes: 4 additions & 0 deletions compiler/rustc_macros/src/diagnostics/subdiagnostic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ impl SubdiagnosticDerive {

let diag = &self.diag;
let f = &self.f;

// FIXME(edition_2024): Fix the `keyword_idents_2024` lint to not trigger here?
#[allow(keyword_idents_2024)]
let ret = structure.gen_impl(quote! {
gen impl rustc_errors::Subdiagnostic for @Self {
fn add_to_diag_with<__G, __F>(
Expand All @@ -100,6 +103,7 @@ impl SubdiagnosticDerive {
}
}
});

ret
}
}
Expand Down

0 comments on commit f08c43a

Please # to comment.