From 35fa4429e3889cc87c2087d5faa351b5861d408c Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 18 Sep 2017 20:23:08 -0700 Subject: [PATCH] Rust upgrade to rustc 1.22.0-nightly (0701b37d9 2017-09-18) --- clippy_lints/src/bit_mask.rs | 2 +- clippy_lints/src/consts.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clippy_lints/src/bit_mask.rs b/clippy_lints/src/bit_mask.rs index db57864cb2f..9b64a42d4f7 100644 --- a/clippy_lints/src/bit_mask.rs +++ b/clippy_lints/src/bit_mask.rs @@ -307,7 +307,7 @@ fn fetch_int_literal(cx: &LateContext, lit: &Expr) -> Option { 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) }) diff --git a/clippy_lints/src/consts.rs b/clippy_lints/src/consts.rs index 2611ba1adf2..7e6f3c2acf1 100644 --- a/clippy_lints/src/consts.rs +++ b/clippy_lints/src/consts.rs @@ -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() {