nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 08:13:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

BorrowckDiags tweaks.

Browse Source 
- Store a mut ref to a `BorrowckDiags` in `MirBorrowckCtxt` instead of
  owning it, to save having to pass ownership in and out of
  `promoted_mbcx`.
- Use `buffer_error` in a couple of suitable places.
This commit is contained in:
Nicholas Nethercote 2024-10-25 19:47:40 +11:00
parent ce2f0b4ce9
commit e0e7a432db
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/rustc_borrowck/src/lib.rs
View File

@ -162,7 +162,7 @@ fn do_mir_borrowck<'tcx>(
} }
} }
let mut diags = diags::BorrowckDiags::new(); let diags = &mut diags::BorrowckDiags::new();
// Gather the upvars of a closure, if any. // Gather the upvars of a closure, if any.
if let Some(e) = input_body.tainted_by_errors { if let Some(e) = input_body.tainted_by_errors {
@ -227,14 +227,7 @@ fn do_mir_borrowck<'tcx>(
// We also have a `#[rustc_regions]` annotation that causes us to dump // We also have a `#[rustc_regions]` annotation that causes us to dump
// information. // information.
nll::dump_annotation( nll::dump_annotation(&infcx, body, &regioncx, &opt_closure_req, &opaque_type_values, diags);
&infcx,
body,
&regioncx,
&opt_closure_req,
&opaque_type_values,
&mut diags,
);
// The various `flow_*` structures can be large. We drop `flow_inits` here // The various `flow_*` structures can be large. We drop `flow_inits` here
// so it doesn't overlap with the others below. This reduces peak memory // so it doesn't overlap with the others below. This reduces peak memory
@ -299,7 +292,6 @@ fn do_mir_borrowck<'tcx>(
}; };
MoveVisitor { ctxt: &mut promoted_mbcx }.visit_body(promoted_body); MoveVisitor { ctxt: &mut promoted_mbcx }.visit_body(promoted_body);
promoted_mbcx.report_move_errors(); promoted_mbcx.report_move_errors();
diags = promoted_mbcx.diags;
struct MoveVisitor<'a, 'b, 'infcx, 'tcx> { struct MoveVisitor<'a, 'b, 'infcx, 'tcx> {
ctxt: &'a mut MirBorrowckCtxt<'b, 'infcx, 'tcx>, ctxt: &'a mut MirBorrowckCtxt<'b, 'infcx, 'tcx>,
@ -587,7 +579,7 @@ struct MirBorrowckCtxt<'a, 'infcx, 'tcx> {
/// Results of Polonius analysis. /// Results of Polonius analysis.
polonius_output: Option<Box<PoloniusOutput>>, polonius_output: Option<Box<PoloniusOutput>>,
diags: diags::BorrowckDiags<'infcx, 'tcx>, diags: &'a mut diags::BorrowckDiags<'infcx, 'tcx>,
move_errors: Vec<MoveError<'tcx>>, move_errors: Vec<MoveError<'tcx>>,
} }
@ -2506,7 +2498,7 @@ mod diags {
// Buffer any move errors that we collected and de-duplicated. // Buffer any move errors that we collected and de-duplicated.
for (_, (_, diag)) in std::mem::take(&mut self.diags.buffered_move_errors) { for (_, (_, diag)) in std::mem::take(&mut self.diags.buffered_move_errors) {
// We have already set tainted for this error, so just buffer it. // We have already set tainted for this error, so just buffer it.
self.diags.buffered_diags.push(BufferedDiag::Error(diag)); self.diags.buffer_error(diag);
} }
for (_, (mut diag, count)) in std::mem::take(&mut self.diags.buffered_mut_errors) { for (_, (mut diag, count)) in std::mem::take(&mut self.diags.buffered_mut_errors) {
if count > 10 { if count > 10 {
@ -2514,7 +2506,7 @@ mod diags {
#[allow(rustc::untranslatable_diagnostic)] #[allow(rustc::untranslatable_diagnostic)]
diag.note(format!("...and {} other attempted mutable borrows", count - 10)); diag.note(format!("...and {} other attempted mutable borrows", count - 10));
} }
self.diags.buffered_diags.push(BufferedDiag::Error(diag)); self.diags.buffer_error(diag);
} }
if !self.diags.buffered_diags.is_empty() { if !self.diags.buffered_diags.is_empty() {