From 5fa240e96a5f5a0f4f819feda34fd6927cf7d60d Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Sun, 1 Jul 2018 10:29:18 -0400
Subject: [PATCH] rename `constraint_set` to `constraints`

also promote to its own directory, make local to nll
---
 .../borrow_check/nll/{constraint_set.rs => constraints/mod.rs} | 0
 src/librustc_mir/borrow_check/nll/mod.rs                       | 2 +-
 src/librustc_mir/borrow_check/nll/region_infer/graphviz.rs     | 2 +-
 src/librustc_mir/borrow_check/nll/region_infer/mod.rs          | 2 +-
 .../borrow_check/nll/type_check/constraint_conversion.rs       | 3 +--
 src/librustc_mir/borrow_check/nll/type_check/mod.rs            | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename src/librustc_mir/borrow_check/nll/{constraint_set.rs => constraints/mod.rs} (100%)

diff --git a/src/librustc_mir/borrow_check/nll/constraint_set.rs b/src/librustc_mir/borrow_check/nll/constraints/mod.rs
similarity index 100%
rename from src/librustc_mir/borrow_check/nll/constraint_set.rs
rename to src/librustc_mir/borrow_check/nll/constraints/mod.rs
diff --git a/src/librustc_mir/borrow_check/nll/mod.rs b/src/librustc_mir/borrow_check/nll/mod.rs
index 1891cac268c..26298a289fc 100644
--- a/src/librustc_mir/borrow_check/nll/mod.rs
+++ b/src/librustc_mir/borrow_check/nll/mod.rs
@@ -45,7 +45,7 @@
 crate mod type_check;
 mod universal_regions;
 
-crate mod constraint_set;
+mod constraints;
 
 use self::facts::AllFacts;
 use self::region_infer::RegionInferenceContext;
diff --git a/src/librustc_mir/borrow_check/nll/region_infer/graphviz.rs b/src/librustc_mir/borrow_check/nll/region_infer/graphviz.rs
index 0116fbcfc88..8be51257cd6 100644
--- a/src/librustc_mir/borrow_check/nll/region_infer/graphviz.rs
+++ b/src/librustc_mir/borrow_check/nll/region_infer/graphviz.rs
@@ -17,7 +17,7 @@
 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> {
diff --git a/src/librustc_mir/borrow_check/nll/region_infer/mod.rs b/src/librustc_mir/borrow_check/nll/region_infer/mod.rs
index f0ada4a85a1..e4426ff3869 100644
--- a/src/librustc_mir/borrow_check/nll/region_infer/mod.rs
+++ b/src/librustc_mir/borrow_check/nll/region_infer/mod.rs
@@ -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;
diff --git a/src/librustc_mir/borrow_check/nll/type_check/constraint_conversion.rs b/src/librustc_mir/borrow_check/nll/type_check/constraint_conversion.rs
index a5a159fbb1c..64a61972a22 100644
--- a/src/librustc_mir/borrow_check/nll/type_check/constraint_conversion.rs
+++ b/src/librustc_mir/borrow_check/nll/type_check/constraint_conversion.rs
@@ -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};
diff --git a/src/librustc_mir/borrow_check/nll/type_check/mod.rs b/src/librustc_mir/borrow_check/nll/type_check/mod.rs
index 97a74e0d336..25f2be23177 100644
--- a/src/librustc_mir/borrow_check/nll/type_check/mod.rs
+++ b/src/librustc_mir/borrow_check/nll/type_check/mod.rs
@@ -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;
-- 
2.44.0