about summary refs log tree commit diff
path: root/src/librustc_traits
diff options
context:
space:
mode:
authorvarkor <github@varkor.com>2019-03-18 20:55:19 +0000
committervarkor <github@varkor.com>2019-05-01 23:11:19 +0100
commitfc16b0a1476bdd1aa8fafd69dc841b5f539bc94e (patch)
tree0df29039e27938079356b38c5f1c6c8b46eb80b3 /src/librustc_traits
parentc888af52be46ed87bb14043da02df486288701c6 (diff)
downloadrust-fc16b0a1476bdd1aa8fafd69dc841b5f539bc94e.tar.gz
rust-fc16b0a1476bdd1aa8fafd69dc841b5f539bc94e.zip
Fix rebase from LazyConst removal
Diffstat (limited to 'src/librustc_traits')
-rw-r--r--src/librustc_traits/chalk_context/resolvent_ops.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/librustc_traits/chalk_context/resolvent_ops.rs b/src/librustc_traits/chalk_context/resolvent_ops.rs
index 7fc05308754..6bc62364b43 100644
--- a/src/librustc_traits/chalk_context/resolvent_ops.rs
+++ b/src/librustc_traits/chalk_context/resolvent_ops.rs
@@ -279,13 +279,13 @@ impl TypeRelation<'cx, 'gcx, 'tcx> for AnswerSubstitutor<'cx, 'gcx, 'tcx> {
 
     fn consts(
         &mut self,
-        a: &'tcx ty::LazyConst<'tcx>,
-        b: &'tcx ty::LazyConst<'tcx>,
-    ) -> RelateResult<'tcx, &'tcx ty::LazyConst<'tcx>> {
-        if let ty::LazyConst::Evaluated(ty::Const {
+        a: &'tcx ty::Const<'tcx>,
+        b: &'tcx ty::Const<'tcx>,
+    ) -> RelateResult<'tcx, &'tcx ty::Const<'tcx>> {
+        if let ty::Const {
             val: ConstValue::Infer(InferConst::Canonical(debruijn, bound_ct)),
             ..
-        }) = a {
+        } = a {
             if *debruijn == self.binder_index {
                 self.unify_free_answer_var(*bound_ct, b.into())?;
                 return Ok(b);
@@ -294,14 +294,14 @@ impl TypeRelation<'cx, 'gcx, 'tcx> for AnswerSubstitutor<'cx, 'gcx, 'tcx> {
 
         match (a, b) {
             (
-                ty::LazyConst::Evaluated(ty::Const {
+                ty::Const {
                     val: ConstValue::Infer(InferConst::Canonical(a_debruijn, a_bound)),
                     ..
-                }),
-                ty::LazyConst::Evaluated(ty::Const {
+                },
+                ty::Const {
                     val: ConstValue::Infer(InferConst::Canonical(b_debruijn, b_bound)),
                     ..
-                }),
+                },
             ) => {
                 assert_eq!(a_debruijn, b_debruijn);
                 assert_eq!(a_bound, b_bound);