rename `constraint_set` to `constraints`
also promote to its own directory, make local to nll
This commit is contained in:
parent
d54e7e32b2
commit
5fa240e96a
|
@ -45,7 +45,7 @@ mod renumber;
|
|||
crate mod type_check;
|
||||
mod universal_regions;
|
||||
|
||||
crate mod constraint_set;
|
||||
mod constraints;
|
||||
|
||||
use self::facts::AllFacts;
|
||||
use self::region_infer::RegionInferenceContext;
|
||||
|
|
|
@ -17,7 +17,7 @@ use rustc_data_structures::indexed_vec::Idx;
|
|||
use std::borrow::Cow;
|
||||
use std::io::{self, Write};
|
||||
use super::*;
|
||||
use borrow_check::nll::constraint_set::OutlivesConstraint;
|
||||
use borrow_check::nll::constraints::OutlivesConstraint;
|
||||
|
||||
|
||||
impl<'tcx> RegionInferenceContext<'tcx> {
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
// except according to those terms.
|
||||
|
||||
use super::universal_regions::UniversalRegions;
|
||||
use borrow_check::nll::constraint_set::{
|
||||
use borrow_check::nll::constraints::{
|
||||
ConstraintIndex, ConstraintGraph, ConstraintSet, OutlivesConstraint
|
||||
};
|
||||
use borrow_check::nll::type_check::Locations;
|
||||
|
|
|
@ -9,12 +9,11 @@
|
|||
// except according to those terms.
|
||||
|
||||
use borrow_check::location::LocationTable;
|
||||
use borrow_check::nll::constraint_set::OutlivesConstraint;
|
||||
use borrow_check::nll::constraints::{ConstraintSet, OutlivesConstraint};
|
||||
use borrow_check::nll::facts::AllFacts;
|
||||
use borrow_check::nll::region_infer::{RegionTest, TypeTest};
|
||||
use borrow_check::nll::type_check::Locations;
|
||||
use borrow_check::nll::universal_regions::UniversalRegions;
|
||||
use borrow_check::nll::constraint_set::ConstraintSet;
|
||||
use rustc::infer::canonical::QueryRegionConstraint;
|
||||
use rustc::infer::outlives::obligations::{TypeOutlives, TypeOutlivesDelegate};
|
||||
use rustc::infer::region_constraints::{GenericKind, VerifyBound};
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
use borrow_check::borrow_set::BorrowSet;
|
||||
use borrow_check::location::LocationTable;
|
||||
use borrow_check::nll::constraint_set::{ConstraintSet, OutlivesConstraint};
|
||||
use borrow_check::nll::constraints::{ConstraintSet, OutlivesConstraint};
|
||||
use borrow_check::nll::facts::AllFacts;
|
||||
use borrow_check::nll::region_infer::{ClosureRegionRequirementsExt, TypeTest};
|
||||
use borrow_check::nll::universal_regions::UniversalRegions;
|
||||
|
|
Loading…
Reference in New Issue