diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2019-11-08 23:11:31 +0100 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2019-11-12 20:14:53 +0100 |
| commit | ff6b7cd7c13c172b829b0dc12edfc2a20f7c3c32 (patch) | |
| tree | 9b9332a63cac2f5ebb29fa7082a22681a68791c7 | |
| parent | ee33e0279a66526f8edf6b71e5d47fc5d9fbd0bc (diff) | |
| download | rust-ff6b7cd7c13c172b829b0dc12edfc2a20f7c3c32.tar.gz rust-ff6b7cd7c13c172b829b0dc12edfc2a20f7c3c32.zip | |
Rename in librustc_traits.
| -rw-r--r-- | src/librustc_traits/chalk_context/mod.rs | 3 | ||||
| -rw-r--r-- | src/librustc_traits/chalk_context/resolvent_ops.rs | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/librustc_traits/chalk_context/mod.rs b/src/librustc_traits/chalk_context/mod.rs index 8d136a1b65c..d9f0b8550bb 100644 --- a/src/librustc_traits/chalk_context/mod.rs +++ b/src/librustc_traits/chalk_context/mod.rs @@ -37,7 +37,6 @@ use rustc::ty::{self, TyCtxt}; use rustc::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor}; use rustc::ty::query::Providers; use rustc::ty::subst::{GenericArg, GenericArgKind}; -use rustc::mir::interpret::ConstValue; use syntax_pos::DUMMY_SP; use std::fmt::{self, Debug}; @@ -286,7 +285,7 @@ impl context::ContextOps<ChalkArenas<'tcx>> for ChalkContext<'tcx> { _ => false, }, GenericArgKind::Const(ct) => match ct.val { - ConstValue::Bound(debruijn, bound_ct) => { + ty::ConstKind::Bound(debruijn, bound_ct) => { debug_assert_eq!(debruijn, ty::INNERMOST); cvar == bound_ct } diff --git a/src/librustc_traits/chalk_context/resolvent_ops.rs b/src/librustc_traits/chalk_context/resolvent_ops.rs index 49d76681196..b8893d65ced 100644 --- a/src/librustc_traits/chalk_context/resolvent_ops.rs +++ b/src/librustc_traits/chalk_context/resolvent_ops.rs @@ -19,7 +19,6 @@ use rustc::traits::{ use rustc::ty::{self, Ty, TyCtxt}; use rustc::ty::subst::GenericArg; use rustc::ty::relate::{Relate, RelateResult, TypeRelation}; -use rustc::mir::interpret::ConstValue; use syntax_pos::DUMMY_SP; use super::{ChalkInferenceContext, ChalkArenas, ChalkExClause, ConstrainedSubst}; @@ -287,7 +286,7 @@ impl TypeRelation<'tcx> for AnswerSubstitutor<'cx, 'tcx> { a: &'tcx ty::Const<'tcx>, b: &'tcx ty::Const<'tcx>, ) -> RelateResult<'tcx, &'tcx ty::Const<'tcx>> { - if let ty::Const { val: ConstValue::Bound(debruijn, bound_ct), .. } = a { + if let ty::Const { val: ty::ConstKind::Bound(debruijn, bound_ct), .. } = a { if *debruijn == self.binder_index { self.unify_free_answer_var(*bound_ct, b.into())?; return Ok(b); @@ -296,8 +295,8 @@ impl TypeRelation<'tcx> for AnswerSubstitutor<'cx, 'tcx> { match (a, b) { ( - ty::Const { val: ConstValue::Bound(a_debruijn, a_bound), .. }, - ty::Const { val: ConstValue::Bound(b_debruijn, b_bound), .. }, + ty::Const { val: ty::ConstKind::Bound(a_debruijn, a_bound), .. }, + ty::Const { val: ty::ConstKind::Bound(b_debruijn, b_bound), .. }, ) => { assert_eq!(a_debruijn, b_debruijn); assert_eq!(a_bound, b_bound); |
