bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

MirBorrowckCtxt::polonius_output to ref

Browse source
This commit is contained in:
lcnr 2025-04-11 11:18:32 +02:00
parent 01864596dc
commit 0e294f2c2f
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_borrowck/src/lib.rs
View file

@ -446,9 +446,9 @@ fn do_mir_borrowck<'tcx>(
local_names, local_names,
region_names: RefCell::default(), region_names: RefCell::default(),
next_region_name: RefCell::new(1), next_region_name: RefCell::new(1),
polonius_output,
move_errors: Vec::new(), move_errors: Vec::new(),
diags_buffer, diags_buffer,
polonius_output: polonius_output.as_deref(),
polonius_diagnostics: polonius_diagnostics.as_ref(), polonius_diagnostics: polonius_diagnostics.as_ref(),
}; };
@ -505,7 +505,6 @@ fn do_mir_borrowck<'tcx>(
}; };
let body_with_facts = if consumer_options.is_some() { let body_with_facts = if consumer_options.is_some() {
let output_facts = mbcx.polonius_output;
Some(Box::new(BodyWithBorrowckFacts { Some(Box::new(BodyWithBorrowckFacts {
body: body_owned, body: body_owned,
promoted, promoted,
@ -513,7 +512,7 @@ fn do_mir_borrowck<'tcx>(
region_inference_context: regioncx, region_inference_context: regioncx,
location_table: polonius_input.as_ref().map(|_| location_table), location_table: polonius_input.as_ref().map(|_| location_table),
input_facts: polonius_input, input_facts: polonius_input,
output_facts, output_facts: polonius_output,
})) }))
} else { } else {
None None
@ -700,12 +699,11 @@ struct MirBorrowckCtxt<'a, 'infcx, 'tcx> {
/// The counter for generating new region names. /// The counter for generating new region names.
next_region_name: RefCell<usize>, next_region_name: RefCell<usize>,
/// Results of Polonius analysis.
polonius_output: Option<Box<PoloniusOutput>>,
diags_buffer: &'a mut BorrowckDiagnosticsBuffer<'infcx, 'tcx>, diags_buffer: &'a mut BorrowckDiagnosticsBuffer<'infcx, 'tcx>,
move_errors: Vec<MoveError<'tcx>>, move_errors: Vec<MoveError<'tcx>>,
/// Results of Polonius analysis.
polonius_output: Option<&'a PoloniusOutput>,
/// When using `-Zpolonius=next`: the data used to compute errors and diagnostics. /// When using `-Zpolonius=next`: the data used to compute errors and diagnostics.
polonius_diagnostics: Option<&'a PoloniusDiagnosticsContext>, polonius_diagnostics: Option<&'a PoloniusDiagnosticsContext>,
} }