@@ -16,7 +16,7 @@ use rustc::infer::region_constraints::{RegionConstraintData, Constraint};
1616use rustc:: middle:: resolve_lifetime as rl;
1717use rustc:: middle:: lang_items;
1818use rustc:: middle:: stability;
19- use rustc:: mir:: interpret:: { GlobalId , ConstValue } ;
19+ use rustc:: mir:: interpret:: GlobalId ;
2020use rustc:: hir;
2121use rustc:: hir:: def:: { CtorKind , DefKind , Res } ;
2222use rustc:: hir:: def_id:: { CrateNum , DefId , CRATE_DEF_INDEX , LOCAL_CRATE } ;
@@ -3075,7 +3075,7 @@ impl<'tcx> Clean<Type> for Ty<'tcx> {
30753075 ty:: Slice ( ty) => Slice ( box ty. clean ( cx) ) ,
30763076 ty:: Array ( ty, n) => {
30773077 let mut n = cx. tcx . lift ( & n) . expect ( "array lift failed" ) ;
3078- if let ConstValue :: Unevaluated ( def_id, substs) = n. val {
3078+ if let ty :: ConstKind :: Unevaluated ( def_id, substs) = n. val {
30793079 let param_env = cx. tcx . param_env ( def_id) ;
30803080 let cid = GlobalId {
30813081 instance : ty:: Instance :: new ( def_id, substs) ,
@@ -4234,7 +4234,7 @@ fn name_from_pat(p: &hir::Pat) -> String {
42344234
42354235fn print_const ( cx : & DocContext < ' _ > , n : & ty:: Const < ' _ > ) -> String {
42364236 match n. val {
4237- ConstValue :: Unevaluated ( def_id, _) => {
4237+ ty :: ConstKind :: Unevaluated ( def_id, _) => {
42384238 if let Some ( hir_id) = cx. tcx . hir ( ) . as_local_hir_id ( def_id) {
42394239 print_const_expr ( cx, cx. tcx . hir ( ) . body_owned_by ( hir_id) )
42404240 } else {
0 commit comments