---

yaml
---
r: 162797
b: refs/heads/try
c: 9aeaaab
h: refs/heads/master
i:
  162795: 064d704
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 9146a919b616e39e528e4d7100d16eef52f1f852
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cafe2966770ff377aad6dd9fd808e68055587c58
-refs/heads/try: adda9c152096459bd9925114e7c742619939ac49
+refs/heads/try: 9aeaaab3347657375e4d20855f8faebb2ab128da
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/librustc/middle/infer/region_inference/doc.rs

@@ -371,4 +371,4 @@
 //! ### Skolemization
 //!
 //! For a discussion on skolemization and higher-ranked subtyping, please
-//! see the module `middle::typeck::infer::higher_ranked::doc`.
+//! see the module `middle::infer::higher_ranked::doc`.

branches/try/src/librustc/middle/typeck/check/regionmanip.rs

@@ -380,3 +380,22 @@ impl<'a, 'tcx> Wf<'a, 'tcx> {
         }
     }
 }
+
+impl<'tcx> Repr<'tcx> for WfConstraint<'tcx> {
+    fn repr(&self, tcx: &ty::ctxt) -> String {
+        match *self {
+            RegionSubRegionConstraint(_, r_a, r_b) => {
+                format!("RegionSubRegionConstraint({}, {})",
+                        r_a.repr(tcx),
+                        r_b.repr(tcx))
+            }
+
+            RegionSubParamConstraint(_, r, p) => {
+                format!("RegionSubParamConstraint({}, {})",
+                        r.repr(tcx),
+                        p.repr(tcx))
+            }
+        }
+    }
+}
+

branches/try/src/librustc/util/ppaux.rs

@@ -23,7 +23,6 @@ use middle::ty::{ty_param, ty_ptr, ty_rptr, ty_tup, ty_open};
 use middle::ty::{ty_unboxed_closure};
 use middle::ty::{ty_uniq, ty_trait, ty_int, ty_uint, ty_infer};
 use middle::ty;
-use middle::typeck::check::regionmanip;
 
 use std::rc::Rc;
 use syntax::abi;
@@ -1292,24 +1291,6 @@ impl<'tcx> Repr<'tcx> for ty::ExplicitSelfCategory {
     }
 }
 
-impl<'tcx> Repr<'tcx> for regionmanip::WfConstraint<'tcx> {
-    fn repr(&self, tcx: &ctxt) -> String {
-        match *self {
-            regionmanip::RegionSubRegionConstraint(_, r_a, r_b) => {
-                format!("RegionSubRegionConstraint({}, {})",
-                        r_a.repr(tcx),
-                        r_b.repr(tcx))
-            }
-
-            regionmanip::RegionSubParamConstraint(_, r, p) => {
-                format!("RegionSubParamConstraint({}, {})",
-                        r.repr(tcx),
-                        p.repr(tcx))
-            }
-        }
-    }
-}
-
 impl<'tcx> UserString<'tcx> for ParamTy {
     fn user_string(&self, tcx: &ctxt) -> String {
         let id = self.idx;