Skip to content

Commit 537c667

Browse files
committed
rename constraint_set to constraints
also promote to its own directory, make local to nll
1 parent 01fc740 commit 537c667

File tree

6 files changed

+5
-6
lines changed

6 files changed

+5
-6
lines changed

src/librustc_mir/borrow_check/nll/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ mod renumber;
4545
crate mod type_check;
4646
mod universal_regions;
4747

48-
crate mod constraint_set;
48+
mod constraints;
4949

5050
use self::facts::AllFacts;
5151
use self::region_infer::RegionInferenceContext;

src/librustc_mir/borrow_check/nll/region_infer/graphviz.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use rustc_data_structures::indexed_vec::Idx;
1717
use std::borrow::Cow;
1818
use std::io::{self, Write};
1919
use super::*;
20-
use borrow_check::nll::constraint_set::OutlivesConstraint;
20+
use borrow_check::nll::constraints::OutlivesConstraint;
2121

2222

2323
impl<'tcx> RegionInferenceContext<'tcx> {

src/librustc_mir/borrow_check/nll/region_infer/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
use super::universal_regions::UniversalRegions;
12-
use borrow_check::nll::constraint_set::{
12+
use borrow_check::nll::constraints::{
1313
ConstraintIndex, ConstraintGraph, ConstraintSet, OutlivesConstraint
1414
};
1515
use borrow_check::nll::type_check::Locations;

src/librustc_mir/borrow_check/nll/type_check/constraint_conversion.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
// except according to those terms.
1010

1111
use borrow_check::location::LocationTable;
12-
use borrow_check::nll::constraint_set::OutlivesConstraint;
12+
use borrow_check::nll::constraints::{ConstraintSet, OutlivesConstraint};
1313
use borrow_check::nll::facts::AllFacts;
1414
use borrow_check::nll::region_infer::{RegionTest, TypeTest};
1515
use borrow_check::nll::type_check::Locations;
1616
use borrow_check::nll::universal_regions::UniversalRegions;
17-
use borrow_check::nll::constraint_set::ConstraintSet;
1817
use rustc::infer::canonical::QueryRegionConstraint;
1918
use rustc::infer::outlives::obligations::{TypeOutlives, TypeOutlivesDelegate};
2019
use rustc::infer::region_constraints::{GenericKind, VerifyBound};

src/librustc_mir/borrow_check/nll/type_check/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use borrow_check::borrow_set::BorrowSet;
1515
use borrow_check::location::LocationTable;
16-
use borrow_check::nll::constraint_set::{ConstraintSet, OutlivesConstraint};
16+
use borrow_check::nll::constraints::{ConstraintSet, OutlivesConstraint};
1717
use borrow_check::nll::facts::AllFacts;
1818
use borrow_check::nll::region_infer::{ClosureRegionRequirementsExt, TypeTest};
1919
use borrow_check::nll::universal_regions::UniversalRegions;

0 commit comments

Comments
 (0)