Rust upgrade to rustc 1.22.0-nightly (0701b37d9 2017-09-18)

This commit is contained in:
Manish Goregaokar 2017-09-18 20:23:08 -07:00
parent 0b64222a68
commit 35fa4429e3
2 changed files with 2 additions and 2 deletions

View File

@ -307,7 +307,7 @@ fn fetch_int_literal(cx: &LateContext, lit: &Expr) -> Option<u128> {
cx.tcx.mir_const_qualif(def_id);
cx.tcx.hir.body(cx.tcx.hir.body_owned_by(id))
} else {
cx.tcx.extern_const_body(def_id)
cx.tcx.extern_const_body(def_id).body
};
fetch_int_literal(cx, &body.value)
})

View File

@ -298,7 +298,7 @@ impl<'c, 'cc> ConstEvalLateContext<'c, 'cc> {
self.tcx.mir_const_qualif(def_id);
self.tcx.hir.body(self.tcx.hir.body_owned_by(id))
} else {
self.tcx.extern_const_body(def_id)
self.tcx.extern_const_body(def_id).body
};
let ret = cx.expr(&body.value);
if ret.is_some() {