rename AllFacts to PoloniusFacts

This is another strangely named struct (and associated fields) that is
hard to see was related to datalog polonius.

Author: lqd

compiler/rustc_borrowck/src/consumers.rs

@@ -11,7 +11,7 @@ pub use super::dataflow::{BorrowIndex, Borrows, calculate_borrows_out_of_scope_a
 pubusesuper::place_ext::PlaceExt;
 pubusesuper::places_conflict::{PlaceConflictBias, places_conflict};
 pubusesuper::polonius::legacy::{
-AllFactsasPoloniusInput,PoloniusLocationTable,PoloniusOutput,PoloniusRegionVid,
+PoloniusFactsasPoloniusInput,PoloniusLocationTable,PoloniusOutput,PoloniusRegionVid,
 RichLocation,RustcFacts,
 };
 pubusesuper::region_infer::RegionInferenceContext;

compiler/rustc_borrowck/src/nll.rs

@@ -28,7 +28,9 @@ use crate::borrow_set::BorrowSet;
 usecrate::consumers::ConsumerOptions;
 usecrate::diagnostics::{BorrowckDiagnosticsBuffer,RegionErrors};
 usecrate::polonius::LocalizedOutlivesConstraintSet;
-usecrate::polonius::legacy::{AllFacts,AllFactsExt,PoloniusLocationTable,PoloniusOutput};
+usecrate::polonius::legacy::{
+PoloniusFacts,PoloniusFactsExt,PoloniusLocationTable,PoloniusOutput,
+};
 usecrate::region_infer::RegionInferenceContext;
 usecrate::type_check::{self,MirTypeckResults};
 usecrate::universal_regions::UniversalRegions;
@@ -39,7 +41,7 @@ use crate::{BorrowckInferCtxt, polonius, renumber};
 pub(crate)structNllOutput<'tcx>{
 pubregioncx:RegionInferenceContext<'tcx>,
 pubopaque_type_values:FxIndexMap<LocalDefId,OpaqueHiddenType<'tcx>>,
-pubpolonius_input:Option<Box<AllFacts>>,
+pubpolonius_input:Option<Box<PoloniusFacts>>,
 pubpolonius_output:Option<Box<PoloniusOutput>>,
 pubopt_closure_req:Option<ClosureRegionRequirements<'tcx>>,
 pubnll_errors:RegionErrors<'tcx>,
@@ -91,8 +93,8 @@ pub(crate) fn compute_regions<'a, 'tcx>(
  || is_polonius_legacy_enabled;
 let polonius_output = consumer_options.map(|c| c.polonius_output()).unwrap_or_default()
  || is_polonius_legacy_enabled;
-letmutall_facts =
-(polonius_input || AllFacts::enabled(infcx.tcx)).then_some(AllFacts::default());
+letmutpolonius_facts =
+(polonius_input || PoloniusFacts::enabled(infcx.tcx)).then_some(PoloniusFacts::default());
 
 let location_map = Rc::new(DenseLocationMap::new(body));
 
@@ -109,7 +111,7 @@ pub(crate) fn compute_regions<'a, 'tcx>(
  universal_regions,
  location_table,
  borrow_set,
-&mutall_facts,
+&mutpolonius_facts,
  flow_inits,
  move_data,
 Rc::clone(&location_map),
@@ -122,7 +124,7 @@ pub(crate) fn compute_regions<'a, 'tcx>(
 
 // If requested, emit legacy polonius facts.
  polonius::legacy::emit_facts(
-&mutall_facts,
+&mutpolonius_facts,
  infcx.tcx,
  location_table,
  body,
@@ -147,13 +149,13 @@ pub(crate) fn compute_regions<'a, 'tcx>(
 });
 
 // If requested: dump NLL facts, and run legacy polonius analysis.
-let polonius_output = all_facts.as_ref().and_then(|all_facts| {
+let polonius_output = polonius_facts.as_ref().and_then(|polonius_facts| {
 if infcx.tcx.sess.opts.unstable_opts.nll_facts{
 let def_id = body.source.def_id();
 let def_path = infcx.tcx.def_path(def_id);
 let dir_path = PathBuf::from(&infcx.tcx.sess.opts.unstable_opts.nll_facts_dir)
 .join(def_path.to_filename_friendly_no_crate());
-all_facts.write_to_dir(dir_path, location_table).unwrap();
+polonius_facts.write_to_dir(dir_path, location_table).unwrap();
 }
 
 if polonius_output {
@@ -162,7 +164,7 @@ pub(crate) fn compute_regions<'a, 'tcx>(
 let algorithm = Algorithm::from_str(&algorithm).unwrap();
 debug!("compute_regions: using polonius algorithm {:?}", algorithm);
 let _prof_timer = infcx.tcx.prof.generic_activity("polonius_analysis");
-Some(Box::new(Output::compute(all_facts, algorithm,false)))
+Some(Box::new(Output::compute(polonius_facts, algorithm,false)))
 }else{
 None
 }
@@ -182,7 +184,7 @@ pub(crate) fn compute_regions<'a, 'tcx>(
 NllOutput{
  regioncx,
 opaque_type_values: remapped_opaque_tys,
-polonius_input:all_facts.map(Box::new),
+polonius_input:polonius_facts.map(Box::new),
  polonius_output,
 opt_closure_req: closure_region_requirements,
  nll_errors,

compiler/rustc_borrowck/src/polonius/legacy/accesses.rs

@@ -4,14 +4,14 @@ use rustc_middle::ty::TyCtxt;
 use rustc_mir_dataflow::move_paths::{LookupResult,MoveData};
 use tracing::debug;
 
-usesuper::{AllFacts,LocationIndex,PoloniusLocationTable};
+usesuper::{LocationIndex,PoloniusFacts,PoloniusLocationTable};
 usecrate::def_use::{self,DefUse};
 usecrate::universal_regions::UniversalRegions;
 
 /// Emit polonius facts for variable defs, uses, drops, and path accesses.
 pub(crate)fnemit_access_facts<'tcx>(
 tcx:TyCtxt<'tcx>,
-facts:&mutAllFacts,
+facts:&mutPoloniusFacts,
 body:&Body<'tcx>,
 location_table:&PoloniusLocationTable,
 move_data:&MoveData<'tcx>,
@@ -31,7 +31,7 @@ pub(crate) fn emit_access_facts<'tcx>(
 
 /// MIR visitor extracting point-wise facts about accesses.
 structAccessFactsExtractor<'a,'tcx>{
-facts:&'amutAllFacts,
+facts:&'amutPoloniusFacts,
 move_data:&'aMoveData<'tcx>,
 location_table:&'aPoloniusLocationTable,
 }

compiler/rustc_borrowck/src/polonius/legacy/facts.rs

@@ -4,7 +4,7 @@ use std::fs::{self, File};
 use std::io::Write;
 use std::path::Path;
 
-use polonius_engine::{AllFactsasPoloniusFacts,Atom,Output};
+use polonius_engine::{AllFacts,Atom,Output};
 use rustc_macros::extension;
 use rustc_middle::mir::Local;
 use rustc_middle::ty::{RegionVid,TyCtxt};
@@ -49,11 +49,11 @@ impl polonius_engine::FactTypes for RustcFacts {
 typePath = MovePathIndex;
 }
 
-pubtypeAllFacts = PoloniusFacts<RustcFacts>;
+pubtypePoloniusFacts = AllFacts<RustcFacts>;
 
-#[extension(pub(crate)traitAllFactsExt)]
-implAllFacts{
-/// Returns `true` if there is a need to gather `AllFacts` given the
+#[extension(pub(crate)traitPoloniusFactsExt)]
+implPoloniusFacts{
+/// Returns `true` if there is a need to gather `PoloniusFacts` given the
 /// current `-Z` flags.
 fnenabled(tcx:TyCtxt<'_>) -> bool{
  tcx.sess.opts.unstable_opts.nll_facts

compiler/rustc_borrowck/src/polonius/legacy/loan_invalidations.rs

@@ -11,7 +11,7 @@ use rustc_middle::mir::{
 use rustc_middle::ty::TyCtxt;
 use tracing::debug;
 
-usesuper::{AllFacts,PoloniusLocationTable};
+usesuper::{PoloniusFacts,PoloniusLocationTable};
 usecrate::borrow_set::BorrowSet;
 usecrate::path_utils::*;
 usecrate::{
@@ -22,7 +22,7 @@ use crate::{
 /// Emit `loan_invalidated_at` facts.
 pub(super)fnemit_loan_invalidations<'tcx>(
 tcx:TyCtxt<'tcx>,
-facts:&mutAllFacts,
+facts:&mutPoloniusFacts,
 body:&Body<'tcx>,
 location_table:&PoloniusLocationTable,
 borrow_set:&BorrowSet<'tcx>,
@@ -35,7 +35,7 @@ pub(super) fn emit_loan_invalidations<'tcx>(
 
 structLoanInvalidationsGenerator<'a,'tcx>{
 tcx:TyCtxt<'tcx>,
-facts:&'amutAllFacts,
+facts:&'amutPoloniusFacts,
 body:&'aBody<'tcx>,
 location_table:&'aPoloniusLocationTable,
 dominators:&'aDominators<BasicBlock>,

compiler/rustc_borrowck/src/polonius/legacy/loan_kills.rs

@@ -6,14 +6,14 @@ use rustc_middle::mir::{
 use rustc_middle::ty::TyCtxt;
 use tracing::debug;
 
-usesuper::{AllFacts,PoloniusLocationTable};
+usesuper::{PoloniusFacts,PoloniusLocationTable};
 usecrate::borrow_set::BorrowSet;
 usecrate::places_conflict;
 
 /// Emit `loan_killed_at` and `cfg_edge` facts at the same time.
 pub(super)fnemit_loan_kills<'tcx>(
 tcx:TyCtxt<'tcx>,
-facts:&mutAllFacts,
+facts:&mutPoloniusFacts,
 body:&Body<'tcx>,
 location_table:&PoloniusLocationTable,
 borrow_set:&BorrowSet<'tcx>,
@@ -26,7 +26,7 @@ pub(super) fn emit_loan_kills<'tcx>(
 
 structLoanKillsGenerator<'a,'tcx>{
 tcx:TyCtxt<'tcx>,
-facts:&'amutAllFacts,
+facts:&'amutPoloniusFacts,
 location_table:&'aPoloniusLocationTable,
 borrow_set:&'aBorrowSet<'tcx>,
 body:&'aBody<'tcx>,

compiler/rustc_borrowck/src/polonius/legacy/mod.rs

@@ -36,7 +36,7 @@ pub use self::facts::*;
 ///
 /// The rest of the facts are emitted during typeck and liveness.
 pub(crate)fnemit_facts<'tcx>(
-all_facts:&mutOption<AllFacts>,
+facts:&mutOption<PoloniusFacts>,
 tcx:TyCtxt<'tcx>,
 location_table:&PoloniusLocationTable,
 body:&Body<'tcx>,
@@ -45,7 +45,7 @@ pub(crate) fn emit_facts<'tcx>(
 universal_region_relations:&UniversalRegionRelations<'tcx>,
 constraints:&MirTypeckRegionConstraints<'tcx>,
 ){
-letSome(facts) = all_factselse{
+letSome(facts) = factselse{
 // We don't do anything if there are no facts to fill.
 return;
 };
@@ -67,7 +67,7 @@ pub(crate) fn emit_facts<'tcx>(
 
 /// Emit facts needed for move/init analysis: moves and assignments.
 fnemit_move_facts(
-facts:&mutAllFacts,
+facts:&mutPoloniusFacts,
 body:&Body<'_>,
 location_table:&PoloniusLocationTable,
 move_data:&MoveData<'_>,
@@ -139,7 +139,7 @@ fn emit_move_facts(
 
 /// Emit universal regions facts, and their relations.
 fnemit_universal_region_facts(
-facts:&mutAllFacts,
+facts:&mutPoloniusFacts,
 borrow_set:&BorrowSet<'_>,
 universal_region_relations:&UniversalRegionRelations<'_>,
 ){
@@ -187,10 +187,10 @@ pub(crate) fn emit_drop_facts<'tcx>(
 local:Local,
 kind:&GenericArg<'tcx>,
 universal_regions:&UniversalRegions<'tcx>,
-all_facts:&mutOption<AllFacts>,
+facts:&mutOption<PoloniusFacts>,
 ){
 debug!("emit_drop_facts(local={:?}, kind={:?}", local, kind);
-letSome(facts) = all_facts.as_mut()else{return};
+letSome(facts) = facts.as_mut()else{return};
 let _prof_timer = tcx.prof.generic_activity("polonius_fact_generation");
  tcx.for_each_free_region(kind, |drop_live_region| {
 let region_vid = universal_regions.to_region_vid(drop_live_region);
@@ -201,7 +201,7 @@ pub(crate) fn emit_drop_facts<'tcx>(
 /// Emit facts about the outlives constraints: the `subset` base relation, i.e. not a transitive
 /// closure.
 fnemit_outlives_facts<'tcx>(
-facts:&mutAllFacts,
+facts:&mutPoloniusFacts,
 location_table:&PoloniusLocationTable,
 constraints:&MirTypeckRegionConstraints<'tcx>,
 ){

compiler/rustc_borrowck/src/type_check/liveness/trace.rs

@@ -213,14 +213,14 @@ impl<'a, 'typeck, 'b, 'tcx> LivenessResults<'a, 'typeck, 'b, 'tcx> {
 fnadd_extra_drop_facts(&mutself,relevant_live_locals:&[Local]){
 // This collect is more necessary than immediately apparent
 // because these facts go into `add_drop_live_facts_for()`,
-// which also writes to `all_facts`, and so this is genuinely
+// which also writes to `polonius_facts`, and so this is genuinely
 // a simultaneous overlapping mutable borrow.
 // FIXME for future hackers: investigate whether this is
 // actually necessary; these facts come from Polonius
 // and probably maybe plausibly does not need to go back in.
 // It may be necessary to just pick out the parts of
 // `add_drop_live_facts_for()` that make sense.
-letSome(facts) = self.cx.typeck.all_facts.as_ref()else{return};
+letSome(facts) = self.cx.typeck.polonius_facts.as_ref()else{return};
 let facts_to_add:Vec<_> = {
 let relevant_live_locals:FxIndexSet<_> =
  relevant_live_locals.iter().copied().collect();
@@ -583,7 +583,7 @@ impl<'tcx> LivenessContext<'_, '_, '_, 'tcx> {
  dropped_local,
 &kind,
 self.typeck.universal_regions,
-self.typeck.all_facts,
+self.typeck.polonius_facts,
 );
 }
 }

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -49,7 +49,7 @@ use crate::constraints::{OutlivesConstraint, OutlivesConstraintSet};
 usecrate::diagnostics::UniverseInfo;
 usecrate::member_constraints::MemberConstraintSet;
 usecrate::polonius::PoloniusContext;
-usecrate::polonius::legacy::{AllFacts,PoloniusLocationTable};
+usecrate::polonius::legacy::{PoloniusFacts,PoloniusLocationTable};
 usecrate::region_infer::TypeTest;
 usecrate::region_infer::values::{LivenessValues,PlaceholderIndex,PlaceholderIndices};
 usecrate::renumber::RegionCtxt;
@@ -100,7 +100,7 @@ mod relate_tys;
 /// - `universal_regions` -- the universal regions from `body`s function signature
 /// - `location_table` -- for datalog polonius, the map between `Location`s and `RichLocation`s
 /// - `borrow_set` -- information about borrows occurring in `body`
-/// - `all_facts` -- when using Polonius, this is the generated set of Polonius facts
+/// - `polonius_facts` -- when using Polonius, this is the generated set of Polonius facts
 /// - `flow_inits` -- results of a maybe-init dataflow analysis
 /// - `move_data` -- move-data constructed when performing the maybe-init dataflow analysis
 /// - `location_map` -- map between MIR `Location` and `PointIndex`
@@ -111,7 +111,7 @@ pub(crate) fn type_check<'a, 'tcx>(
 universal_regions:UniversalRegions<'tcx>,
 location_table:&PoloniusLocationTable,
 borrow_set:&BorrowSet<'tcx>,
-all_facts:&mutOption<AllFacts>,
+polonius_facts:&mutOption<PoloniusFacts>,
 flow_inits:ResultsCursor<'a,'tcx,MaybeInitializedPlaces<'a,'tcx>>,
 move_data:&MoveData<'tcx>,
 location_map:Rc<DenseLocationMap>,
@@ -165,7 +165,7 @@ pub(crate) fn type_check<'a, 'tcx>(
 reported_errors:Default::default(),
 universal_regions:&universal_region_relations.universal_regions,
  location_table,
-all_facts,
+polonius_facts,
  borrow_set,
 constraints:&mut constraints,
 polonius_context:&mut polonius_context,
@@ -495,14 +495,14 @@ impl<'a, 'b, 'tcx> TypeVerifier<'a, 'b, 'tcx> {
 
 // Use new sets of constraints and closure bounds so that we can
 // modify their locations.
-letall_facts = &mutNone;
+letpolonius_facts = &mutNone;
 letmut constraints = Default::default();
 letmut liveness_constraints =
 LivenessValues::without_specific_points(Rc::new(DenseLocationMap::new(promoted_body)));
 // Don't try to add borrow_region facts for the promoted MIR
 
 letmut swap_constraints = |this:&mutSelf| {
- mem::swap(this.typeck.all_facts, all_facts);
+ mem::swap(this.typeck.polonius_facts, polonius_facts);
  mem::swap(&mut this.typeck.constraints.outlives_constraints,&mut constraints);
  mem::swap(&mut this.typeck.constraints.liveness_constraints,&mut liveness_constraints);
 };
@@ -561,7 +561,7 @@ struct TypeChecker<'a, 'tcx> {
 reported_errors:FxIndexSet<(Ty<'tcx>,Span)>,
 universal_regions:&'aUniversalRegions<'tcx>,
 location_table:&'aPoloniusLocationTable,
-all_facts:&'amutOption<AllFacts>,
+polonius_facts:&'amutOption<PoloniusFacts>,
 borrow_set:&'aBorrowSet<'tcx>,
 constraints:&'amutMirTypeckRegionConstraints<'tcx>,
 /// When using `-Zpolonius=next`, the helper data used to create polonius constraints.
@@ -2327,18 +2327,18 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
 borrowed_place:&Place<'tcx>,
 ){
 // These constraints are only meaningful during borrowck:
-letSelf{ borrow_set, location_table,all_facts, constraints, .. } = self;
+letSelf{ borrow_set, location_table,polonius_facts, constraints, .. } = self;
 
 // In Polonius mode, we also push a `loan_issued_at` fact
 // linking the loan to the region (in some cases, though,
 // there is no loan associated with this borrow expression --
 // that occurs when we are borrowing an unsafe place, for
 // example).
-ifletSome(all_facts) = all_facts{
+ifletSome(polonius_facts) = polonius_facts{
 let _prof_timer = self.infcx.tcx.prof.generic_activity("polonius_fact_generation");
 ifletSome(borrow_index) = borrow_set.get_index_of(&location){
 let region_vid = borrow_region.as_var();
-all_facts.loan_issued_at.push((
+polonius_facts.loan_issued_at.push((
  region_vid.into(),
  borrow_index,
  location_table.mid_index(location),