Skip to content

Rollup of 7 pull requests #127775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6ff8a84
Suggest a borrow when using dbg
chenyukang Feb 12, 2024
f6c377c
offset_from intrinsic: always allow pointers to point to the same add…
RalfJung May 9, 2024
692bc34
Make parse error suggestions verbose and fix spans
estebank Jul 6, 2024
c2b3287
Make `impl` and `!` removal suggestion `short`
estebank Jul 11, 2024
dd40e0b
Tweak tests to avoid confusing suggestion output
estebank Jul 11, 2024
b5f94c6
Use more accurate span for `:` to `::` suggestion
estebank Jul 11, 2024
377d14b
More accurate incorrect use of `await` suggestion
estebank Jul 11, 2024
b6f5188
fix unused binding
estebank Jul 12, 2024
71f16bd
Make `;` suggestions inline
estebank Jul 12, 2024
90c9e32
consolidate miri-unleashed tests for mutable refs into one file
RalfJung Jul 13, 2024
dc20733
Stop using the gen keyword in the compiler
compiler-errors Jul 14, 2024
f08c43a
Suppress some fallout from gen in synstructure
compiler-errors Jul 14, 2024
80393ea
Fix trivial gen ident usage in tools
compiler-errors Jul 14, 2024
f18d4a8
Add myself to the review rotation
tgross35 Jul 14, 2024
741ed01
coverage: Store a copy of `num_bcbs` in `ExtractedMappings`
Zalathar Jul 15, 2024
d4f1f92
coverage: Restrict `ExpressionUsed` simplification to `Code` mappings
Zalathar Jul 15, 2024
d8cfe7b
Rollup merge of #120990 - chenyukang:yukang-fix-120327-dbg, r=oli-obk
matthiaskrgr Jul 15, 2024
cfc01f1
Rollup merge of #124921 - RalfJung:offset-from-same-addr, r=oli-obk
matthiaskrgr Jul 15, 2024
981a72b
Rollup merge of #127407 - estebank:parser-suggestions, r=oli-obk
matthiaskrgr Jul 15, 2024
3f653b1
Rollup merge of #127684 - RalfJung:unleashed-mutable-refs, r=oli-obk
matthiaskrgr Jul 15, 2024
e7b9260
Rollup merge of #127729 - compiler-errors:ed-2024-gen, r=oli-obk
matthiaskrgr Jul 15, 2024
499d734
Rollup merge of #127736 - tgross35:patch-1, r=Amanieu
matthiaskrgr Jul 15, 2024
dade622
Rollup merge of #127758 - Zalathar:expression-used, r=oli-obk
matthiaskrgr Jul 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Suppress some fallout from gen in synstructure
  • Loading branch information
compiler-errors committed Jul 14, 2024
commit f08c43afc7b801f2ab0109764df9cc959ebc8b79
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