diff --git a/clippy_lints/src/consts.rs b/clippy_lints/src/consts.rs index f56dc3aed69..306395ed5be 100644 --- a/clippy_lints/src/consts.rs +++ b/clippy_lints/src/consts.rs @@ -5,7 +5,7 @@ use rustc::hir::def::Def; use rustc::hir::*; use rustc::lint::LateContext; -use rustc::ty::subst::{Subst, Substs}; +use rustc::ty::subst::{Subst, SubstsRef}; use rustc::ty::{self, Instance, Ty, TyCtxt}; use rustc::{bug, span_bug}; use rustc_data_structures::sync::Lrc; @@ -209,7 +209,7 @@ pub struct ConstEvalLateContext<'a, 'tcx: 'a> { tables: &'a ty::TypeckTables<'tcx>, param_env: ty::ParamEnv<'tcx>, needed_resolution: bool, - substs: &'tcx Substs<'tcx>, + substs: SubstsRef<'tcx>, } impl<'c, 'cc> ConstEvalLateContext<'c, 'cc> { diff --git a/clippy_lints/src/enum_clike.rs b/clippy_lints/src/enum_clike.rs index 46501d55497..8610bffa6ac 100644 --- a/clippy_lints/src/enum_clike.rs +++ b/clippy_lints/src/enum_clike.rs @@ -7,7 +7,7 @@ use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::mir::interpret::GlobalId; use rustc::ty; -use rustc::ty::subst::Substs; +use rustc::ty::subst::InternalSubsts; use rustc::ty::util::IntTypeExt; use rustc::{declare_tool_lint, lint_array}; use syntax::ast::{IntTy, UintTy}; @@ -58,7 +58,7 @@ fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx Item) { if let Some(ref anon_const) = variant.disr_expr { let param_env = ty::ParamEnv::empty(); let def_id = cx.tcx.hir().body_owner_def_id(anon_const.body); - let substs = Substs::identity_for_item(cx.tcx.global_tcx(), def_id); + let substs = InternalSubsts::identity_for_item(cx.tcx.global_tcx(), def_id); let instance = ty::Instance::new(def_id, substs); let c_id = GlobalId { instance,