---

yaml
---
r: 181858
b: refs/heads/auto
c: df92fe3
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: dfc5c0f1e8799f47f9033bdcc8a7cd8a217620a5
+refs/heads/auto: df92fe3c964492a22a2c81896b951ef649438e3b
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc_typeck/check/regionmanip.rs renamed to branches/auto/src/librustc_typeck/check/implicator.rs

@@ -131,7 +131,7 @@ pub mod dropck;
 pub mod _match;
 pub mod vtable;
 pub mod writeback;
-pub mod regionmanip;
+pub mod implicator;
 pub mod regionck;
 pub mod coercion;
 pub mod demand;

branches/auto/src/librustc_typeck/check/mod.rs

@@ -85,7 +85,7 @@
 use astconv::AstConv;
 use check::dropck;
 use check::FnCtxt;
-use check::regionmanip;
+use check::implicator;
 use check::vtable;
 use middle::def;
 use middle::mem_categorization as mc;
@@ -336,24 +336,24 @@ impl<'a, 'tcx> Rcx<'a, 'tcx> {
             let body_scope = CodeExtent::from_node_id(body_id);
             let body_scope = ty::ReScope(body_scope);
             let constraints =
-                regionmanip::region_wf_constraints(
+                implicator::region_wf_constraints(
                     tcx,
                     ty,
                     body_scope);
             for constraint in &constraints {
                 debug!("constraint: {}", constraint.repr(tcx));
                 match *constraint {
-                    regionmanip::RegionSubRegionConstraint(_,
+                    implicator::RegionSubRegionConstraint(_,
                                               ty::ReFree(free_a),
                                               ty::ReFree(free_b)) => {
                         tcx.region_maps.relate_free_regions(free_a, free_b);
                     }
-                    regionmanip::RegionSubRegionConstraint(_,
+                    implicator::RegionSubRegionConstraint(_,
                                               ty::ReFree(free_a),
                                               ty::ReInfer(ty::ReVar(vid_b))) => {
                         self.fcx.inh.infcx.add_given(free_a, vid_b);
                     }
-                    regionmanip::RegionSubRegionConstraint(..) => {
+                    implicator::RegionSubRegionConstraint(..) => {
                         // In principle, we could record (and take
                         // advantage of) every relationship here, but
                         // we are also free not to -- it simply means
@@ -364,7 +364,7 @@ impl<'a, 'tcx> Rcx<'a, 'tcx> {
                         // relationship that arises here, but
                         // presently we do not.)
                     }
-                    regionmanip::RegionSubGenericConstraint(_, r_a, ref generic_b) => {
+                    implicator::RegionSubGenericConstraint(_, r_a, ref generic_b) => {
                         debug!("RegionSubGenericConstraint: {} <= {}",
                                r_a.repr(tcx), generic_b.repr(tcx));
 
@@ -1482,24 +1482,24 @@ pub fn type_must_outlive<'a, 'tcx>(rcx: &mut Rcx<'a, 'tcx>,
            region.repr(rcx.tcx()));
 
     let constraints =
-        regionmanip::region_wf_constraints(
+        implicator::region_wf_constraints(
             rcx.tcx(),
             ty,
             region);
     for constraint in &constraints {
         debug!("constraint: {}", constraint.repr(rcx.tcx()));
         match *constraint {
-            regionmanip::RegionSubRegionConstraint(None, r_a, r_b) => {
+            implicator::RegionSubRegionConstraint(None, r_a, r_b) => {
                 rcx.fcx.mk_subr(origin.clone(), r_a, r_b);
             }
-            regionmanip::RegionSubRegionConstraint(Some(ty), r_a, r_b) => {
+            implicator::RegionSubRegionConstraint(Some(ty), r_a, r_b) => {
                 let o1 = infer::ReferenceOutlivesReferent(ty, origin.span());
                 rcx.fcx.mk_subr(o1, r_a, r_b);
             }
-            regionmanip::RegionSubGenericConstraint(None, r_a, ref generic_b) => {
+            implicator::RegionSubGenericConstraint(None, r_a, ref generic_b) => {
                 generic_must_outlive(rcx, origin.clone(), r_a, generic_b);
             }
-            regionmanip::RegionSubGenericConstraint(Some(ty), r_a, ref generic_b) => {
+            implicator::RegionSubGenericConstraint(Some(ty), r_a, ref generic_b) => {
                 let o1 = infer::ReferenceOutlivesReferent(ty, origin.span());
                 generic_must_outlive(rcx, o1, r_a, generic_b);
             }