Remove ty::BrFresh and new_bound

[rust.git] / src / librustc / infer / glb.rs

diff --git a/src/librustc/infer/glb.rs b/src/librustc/infer/glb.rs
index 910c6571853dc078580721c9068b19672b41b876..63a8f17398a0460bf994dc4e74a6553053dfd12c 100644 (file)
--- a/src/librustc/infer/glb.rs
+++ b/src/librustc/infer/glb.rs
@@ -60,6 +60,19 @@ fn regions(&mut self, a: ty::Region<'tcx>, b: ty::Region<'tcx>)
         Ok(self.fields.infcx.borrow_region_constraints().glb_regions(self.tcx(), origin, a, b))
     }
 
+    fn consts(
+        &mut self,
+        a: &'tcx ty::Const<'tcx>,
+        b: &'tcx ty::Const<'tcx>,
+    ) -> RelateResult<'tcx, &'tcx ty::Const<'tcx>> {
+        debug!("{}.consts({:?}, {:?})", self.tag(), a, b);
+        if a == b {
+            return Ok(a);
+        }
+
+        self.fields.infcx.super_combine_consts(self, a, b)
+    }
+
     fn binders<T>(&mut self, a: &ty::Binder<T>, b: &ty::Binder<T>)
                   -> RelateResult<'tcx, ty::Binder<T>>
         where T: Relate<'tcx>