move facts module to polonius legacy module

this is specific to the old datalog implementation and wasn't noticed in
the previous module move

Author: lqd

compiler/rustc_borrowck/src/consumers.rs

@@ -8,11 +8,12 @@ use rustc_middle::ty::TyCtxt;
 pub use super::borrow_set::{BorrowData, BorrowSet, TwoPhaseActivation};
 pub use super::constraints::OutlivesConstraint;
 pub use super::dataflow::{BorrowIndex, Borrows, calculate_borrows_out_of_scope_at_location};
-pub use super::facts::{AllFacts as PoloniusInput, PoloniusRegionVid, RustcFacts};
-pub use super::nll::PoloniusOutput;
 pub use super::place_ext::PlaceExt;
 pub use super::places_conflict::{PlaceConflictBias, places_conflict};
-pub use super::polonius::legacy::{LocationTable, RichLocation};
+pub use super::polonius::legacy::{
+    AllFacts as PoloniusInput, LocationTable, PoloniusOutput, PoloniusRegionVid, RichLocation,
+    RustcFacts,
+};
 pub use super::region_infer::RegionInferenceContext;
 
 /// Options determining the output behavior of [`get_body_with_borrowck_facts`].

compiler/rustc_borrowck/src/lib.rs

@@ -53,11 +53,10 @@ use crate::borrow_set::{BorrowData, BorrowSet};
 use crate::consumers::{BodyWithBorrowckFacts, ConsumerOptions};
 use crate::dataflow::{BorrowIndex, Borrowck, BorrowckDomain, Borrows};
 use crate::diagnostics::{AccessKind, IllegalMoveOriginKind, MoveError, RegionName};
-use crate::nll::PoloniusOutput;
 use crate::path_utils::*;
 use crate::place_ext::PlaceExt;
 use crate::places_conflict::{PlaceConflictBias, places_conflict};
-use crate::polonius::legacy::LocationTable;
+use crate::polonius::legacy::{LocationTable, PoloniusOutput};
 use crate::prefixes::PrefixSet;
 use crate::region_infer::RegionInferenceContext;
 use crate::renumber::RegionCtxt;
@@ -69,7 +68,6 @@ mod constraints;
 mod dataflow;
 mod def_use;
 mod diagnostics;
-mod facts;
 mod member_constraints;
 mod nll;
 mod path_utils;

compiler/rustc_borrowck/src/nll.rs

@@ -27,16 +27,13 @@ use tracing::{debug, instrument};
 use crate::borrow_set::BorrowSet;
 use crate::consumers::ConsumerOptions;
 use crate::diagnostics::RegionErrors;
-use crate::facts::{AllFacts, AllFactsExt, RustcFacts};
 use crate::polonius::LocalizedOutlivesConstraintSet;
-use crate::polonius::legacy::LocationTable;
+use crate::polonius::legacy::{AllFacts, AllFactsExt, LocationTable, PoloniusOutput};
 use crate::region_infer::RegionInferenceContext;
 use crate::type_check::{self, MirTypeckResults};
 use crate::universal_regions::UniversalRegions;
 use crate::{BorrowckInferCtxt, polonius, renumber};
 
-pub type PoloniusOutput = Output<RustcFacts>;
-
 /// The output of `nll::compute_regions`. This includes the computed `RegionInferenceContext`, any
 /// closure requirements to propagate, and any generated errors.
 pub(crate) struct NllOutput<'tcx> {

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

@@ -4,9 +4,8 @@ use rustc_middle::ty::TyCtxt;
 use rustc_mir_dataflow::move_paths::{LookupResult, MoveData};
 use tracing::debug;
 
-use super::{LocationIndex, LocationTable};
+use super::{AllFacts, LocationIndex, LocationTable};
 use crate::def_use::{self, DefUse};
-use crate::facts::AllFacts;
 use crate::universal_regions::UniversalRegions;
 
 /// Emit polonius facts for variable defs, uses, drops, and path accesses.

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

@@ -4,18 +4,20 @@ use std::fs::{self, File};
 use std::io::Write;
 use std::path::Path;
 
-use polonius_engine::{AllFacts as PoloniusFacts, Atom};
+use polonius_engine::{AllFacts as PoloniusFacts, Atom, Output};
 use rustc_macros::extension;
 use rustc_middle::mir::Local;
 use rustc_middle::ty::{RegionVid, TyCtxt};
 use rustc_mir_dataflow::move_paths::MovePathIndex;
 
+use super::{LocationIndex, LocationTable};
 use crate::BorrowIndex;
-use crate::polonius::legacy::{LocationIndex, LocationTable};
 
 #[derive(Copy, Clone, Debug)]
 pub struct RustcFacts;
 
+pub type PoloniusOutput = Output<RustcFacts>;
+
 rustc_index::newtype_index! {
     /// A (kinda) newtype of `RegionVid` so we can implement `Atom` on it.
     #[orderable]

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

@@ -9,9 +9,8 @@ use rustc_middle::mir::{
 use rustc_middle::ty::TyCtxt;
 use tracing::debug;
 
-use super::LocationTable;
+use super::{AllFacts, LocationTable};
 use crate::borrow_set::BorrowSet;
-use crate::facts::AllFacts;
 use crate::path_utils::*;
 use crate::{
     AccessDepth, Activation, ArtificialField, BorrowIndex, Deep, LocalMutationIsAllowed, Read,

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

@@ -6,9 +6,8 @@ use rustc_middle::mir::{
 use rustc_middle::ty::TyCtxt;
 use tracing::debug;
 
-use super::LocationTable;
+use super::{AllFacts, LocationTable};
 use crate::borrow_set::BorrowSet;
-use crate::facts::AllFacts;
 use crate::places_conflict;
 
 /// Emit `loan_killed_at` and `cfg_edge` facts at the same time.

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

@@ -13,7 +13,6 @@ use tracing::debug;
 
 use crate::borrow_set::BorrowSet;
 use crate::constraints::OutlivesConstraint;
-use crate::facts::{AllFacts, PoloniusRegionVid};
 use crate::type_check::MirTypeckRegionConstraints;
 use crate::type_check::free_region_relations::UniversalRegionRelations;
 use crate::universal_regions::UniversalRegions;
@@ -23,6 +22,8 @@ mod loan_invalidations;
 mod loan_kills;
 mod location;
 pub use self::location::*;
+mod facts;
+pub use self::facts::*;
 
 /// When requested, emit most of the facts needed by polonius:
 /// - moves and assignments

compiler/rustc_borrowck/src/region_infer/mod.rs

@@ -30,7 +30,7 @@ use crate::constraints::{ConstraintSccIndex, OutlivesConstraint, OutlivesConstra
 use crate::dataflow::BorrowIndex;
 use crate::diagnostics::{RegionErrorKind, RegionErrors, UniverseInfo};
 use crate::member_constraints::{MemberConstraintSet, NllMemberConstraintIndex};
-use crate::nll::PoloniusOutput;
+use crate::polonius::legacy::PoloniusOutput;
 use crate::region_infer::reverse_sccs::ReverseSccGraph;
 use crate::region_infer::values::{LivenessValues, RegionElement, RegionValues, ToElementIndex};
 use crate::type_check::free_region_relations::UniversalRegionRelations;

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -47,10 +47,9 @@ use tracing::{debug, instrument, trace};
 use crate::borrow_set::BorrowSet;
 use crate::constraints::{OutlivesConstraint, OutlivesConstraintSet};
 use crate::diagnostics::UniverseInfo;
-use crate::facts::AllFacts;
 use crate::member_constraints::MemberConstraintSet;
 use crate::polonius::PoloniusContext;
-use crate::polonius::legacy::LocationTable;
+use crate::polonius::legacy::{AllFacts, LocationTable};
 use crate::region_infer::TypeTest;
 use crate::region_infer::values::{LivenessValues, PlaceholderIndex, PlaceholderIndices};
 use crate::renumber::RegionCtxt;