move location 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

@@ -9,10 +9,10 @@ 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::location::{LocationTable, RichLocation};
 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::region_infer::RegionInferenceContext;
 
 /// Options determining the output behavior of [`get_body_with_borrowck_facts`].

compiler/rustc_borrowck/src/facts.rs

@@ -11,7 +11,7 @@ use rustc_middle::ty::{RegionVid, TyCtxt};
 use rustc_mir_dataflow::move_paths::MovePathIndex;
 
 use crate::BorrowIndex;
-use crate::location::{LocationIndex, LocationTable};
+use crate::polonius::legacy::{LocationIndex, LocationTable};
 
 #[derive(Copy, Clone, Debug)]
 pub struct RustcFacts;

compiler/rustc_borrowck/src/lib.rs

@@ -53,11 +53,11 @@ 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::location::LocationTable;
 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::prefixes::PrefixSet;
 use crate::region_infer::RegionInferenceContext;
 use crate::renumber::RegionCtxt;
@@ -70,7 +70,6 @@ mod dataflow;
 mod def_use;
 mod diagnostics;
 mod facts;
-mod location;
 mod member_constraints;
 mod nll;
 mod path_utils;

compiler/rustc_borrowck/src/nll.rs

@@ -28,8 +28,8 @@ use crate::borrow_set::BorrowSet;
 use crate::consumers::ConsumerOptions;
 use crate::diagnostics::RegionErrors;
 use crate::facts::{AllFacts, AllFactsExt, RustcFacts};
-use crate::location::LocationTable;
 use crate::polonius::LocalizedOutlivesConstraintSet;
+use crate::polonius::legacy::LocationTable;
 use crate::region_infer::RegionInferenceContext;
 use crate::type_check::{self, MirTypeckResults};
 use crate::universal_regions::UniversalRegions;

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

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

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

@@ -9,9 +9,9 @@ use rustc_middle::mir::{
 use rustc_middle::ty::TyCtxt;
 use tracing::debug;
 
+use super::LocationTable;
 use crate::borrow_set::BorrowSet;
 use crate::facts::AllFacts;
-use crate::location::LocationTable;
 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,9 @@ use rustc_middle::mir::{
 use rustc_middle::ty::TyCtxt;
 use tracing::debug;
 
+use super::LocationTable;
 use crate::borrow_set::BorrowSet;
 use crate::facts::AllFacts;
-use crate::location::LocationTable;
 use crate::places_conflict;
 
 /// Emit `loan_killed_at` and `cfg_edge` facts at the same time.

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

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

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

@@ -15,8 +15,8 @@ use rustc_span::DUMMY_SP;
 use rustc_trait_selection::traits::query::type_op::{DropckOutlives, TypeOp, TypeOpOutput};
 use tracing::debug;
 
-use crate::location::RichLocation;
 use crate::polonius;
+use crate::polonius::legacy::RichLocation;
 use crate::region_infer::values::{self, LiveLoans};
 use crate::type_check::liveness::local_use_map::LocalUseMap;
 use crate::type_check::{NormalizeLocation, TypeChecker};

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

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