more private

Author: mark-i-m

src/librustc_mir/borrow_check/mod.rs

@@ -40,13 +40,11 @@ use crate::dataflow::{do_dataflow, DebugFormatted};
 use crate::dataflow::EverInitializedPlaces;
 use crate::dataflow::{MaybeInitializedPlaces, MaybeUninitializedPlaces};
 
-use self::borrow_set::{BorrowData, BorrowSet};
 use self::flows::Flows;
 use self::location::LocationTable;
 use self::prefixes::PrefixSet;
 use self::MutateMode::{JustWrite, WriteAndRead};
 use self::diagnostics::AccessKind;
-use self::region_infer::RegionInferenceContext;
 
 use self::path_utils::*;
 
@@ -61,15 +59,20 @@ mod facts;
 mod invalidation;
 mod renumber;
 mod member_constraints;
-
-crate mod constraints;
-crate mod universal_regions;
-crate mod type_check;
-crate mod region_infer;
-crate mod borrow_set;
-crate mod place_ext;
-crate mod places_conflict;
-crate mod nll;
+mod constraints;
+mod universal_regions;
+mod type_check;
+mod region_infer;
+mod borrow_set;
+mod place_ext;
+mod places_conflict;
+mod nll;
+
+crate use region_infer::RegionInferenceContext;
+crate use borrow_set::{BorrowSet, BorrowData};
+crate use places_conflict::{places_conflict, PlaceConflictBias};
+crate use place_ext::PlaceExt;
+crate use nll::ToRegionVid;
 
 // FIXME(eddyb) perhaps move this somewhere more centrally.
 #[derive(Debug)]

src/librustc_mir/dataflow/impls/borrows.rs

@@ -6,15 +6,11 @@ use rustc_index::bit_set::BitSet;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_index::vec::{Idx, IndexVec};
 
-use crate::dataflow::{BitDenotation, BottomValue, GenKillSet};
-
 use crate::borrow_check::{
-    borrow_set::{BorrowSet, BorrowData},
-    place_ext::PlaceExt,
-    region_infer::RegionInferenceContext,
-    nll::ToRegionVid,
+    ToRegionVid, BorrowSet, BorrowData, RegionInferenceContext, PlaceExt, PlaceConflictBias,
     places_conflict,
 };
+use crate::dataflow::{BitDenotation, BottomValue, GenKillSet};
 
 use std::rc::Rc;
 
@@ -223,13 +219,13 @@ impl<'a, 'tcx> Borrows<'a, 'tcx> {
             // locations.
             let definitely_conflicting_borrows = other_borrows_of_local
                 .filter(|&&i| {
-                    places_conflict::places_conflict(
+                    places_conflict(
                         self.tcx,
                         self.param_env,
                         self.body,
                         &self.borrow_set.borrows[i].borrowed_place,
                         place,
-                        places_conflict::PlaceConflictBias::NoOverlap)
+                        PlaceConflictBias::NoOverlap)
                 });
 
             trans.kill_all(definitely_conflicting_borrows);