mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1162 from dtolnay/up

Browse Source 
Update to rustc 1.12.0-nightly (1deb02ea6 2016-08-12)
This commit is contained in:
Manish Goregaokar 2016-08-14 09:00:23 +05:30 committed by GitHub
commit e83eac5f42
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clippy_lints/src/utils/mod.rs
View File

@ -5,7 +5,7 @@
use rustc::lint::{LintContext, LateContext, Level, Lint}; use rustc::lint::{LintContext, LateContext, Level, Lint};
use rustc::middle::cstore; use rustc::middle::cstore;
use rustc::session::Session; use rustc::session::Session;
use rustc::traits::ProjectionMode; use rustc::traits::Reveal;
use rustc::traits; use rustc::traits;
use rustc::ty::subst::Subst; use rustc::ty::subst::Subst;
use rustc::ty; use rustc::ty;
@ -274,7 +274,7 @@ pub fn implements_trait<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: ty::Ty<'tcx>,
cx.tcx.populate_implementations_for_trait_if_necessary(trait_id); cx.tcx.populate_implementations_for_trait_if_necessary(trait_id);
let ty = cx.tcx.erase_regions(&ty); let ty = cx.tcx.erase_regions(&ty);
cx.tcx.infer_ctxt(None, None, ProjectionMode::Any).enter(|infcx| { cx.tcx.infer_ctxt(None, None, Reveal::All).enter(|infcx| {
let obligation = cx.tcx.predicate_for_trait_def(traits::ObligationCause::dummy(), let obligation = cx.tcx.predicate_for_trait_def(traits::ObligationCause::dummy(),
trait_id, trait_id,
0, 0,
@ -709,7 +709,7 @@ pub fn return_ty<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, fn_item: NodeId) -> Optio
// not for type parameters. // not for type parameters.
pub fn same_tys<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, a: ty::Ty<'tcx>, b: ty::Ty<'tcx>, parameter_item: NodeId) -> bool { pub fn same_tys<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, a: ty::Ty<'tcx>, b: ty::Ty<'tcx>, parameter_item: NodeId) -> bool {
let parameter_env = ty::ParameterEnvironment::for_item(cx.tcx, parameter_item); let parameter_env = ty::ParameterEnvironment::for_item(cx.tcx, parameter_item);
cx.tcx.infer_ctxt(None, Some(parameter_env), ProjectionMode::Any).enter(|infcx| { cx.tcx.infer_ctxt(None, Some(parameter_env), Reveal::All).enter(|infcx| {
let new_a = a.subst(infcx.tcx, infcx.parameter_environment.free_substs); let new_a = a.subst(infcx.tcx, infcx.parameter_environment.free_substs);
let new_b = b.subst(infcx.tcx, infcx.parameter_environment.free_substs); let new_b = b.subst(infcx.tcx, infcx.parameter_environment.free_substs);
infcx.can_equate(&new_a, &new_b).is_ok() infcx.can_equate(&new_a, &new_b).is_ok()