Update to rustc 1.7.0-nightly (d0bac3f14
2016-01-18)
This commit is contained in:
parent
b5f65ec699
commit
21ba315102
@ -278,7 +278,7 @@ fn fetch_int_literal(cx: &LateContext, lit: &Expr) -> Option<u64> {
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
.and_then(|def_id| lookup_const_by_id(cx.tcx, def_id, None))
|
||||
.and_then(|def_id| lookup_const_by_id(cx.tcx, def_id, None, None))
|
||||
.and_then(|l| fetch_int_literal(cx, l))
|
||||
}
|
||||
_ => None,
|
||||
|
@ -486,7 +486,7 @@ impl<'c, 'cc> ConstEvalLateContext<'c, 'cc> {
|
||||
}
|
||||
// separate if lets to avoid double borrowing the def_map
|
||||
if let Some(id) = maybe_id {
|
||||
if let Some(const_expr) = lookup_const_by_id(lcx.tcx, id, None) {
|
||||
if let Some(const_expr) = lookup_const_by_id(lcx.tcx, id, None, None) {
|
||||
let ret = self.expr(const_expr);
|
||||
if ret.is_some() {
|
||||
self.needed_resolution = true;
|
||||
|
@ -45,7 +45,7 @@ impl LintPass for EscapePass {
|
||||
impl LateLintPass for EscapePass {
|
||||
fn check_fn(&mut self, cx: &LateContext, _: visit::FnKind, decl: &FnDecl, body: &Block, _: Span, id: NodeId) {
|
||||
let param_env = ty::ParameterEnvironment::for_item(cx.tcx, id);
|
||||
let infcx = infer::new_infer_ctxt(cx.tcx, &cx.tcx.tables, Some(param_env), false);
|
||||
let infcx = infer::new_infer_ctxt(cx.tcx, &cx.tcx.tables, Some(param_env));
|
||||
let mut v = EscapeDelegate {
|
||||
cx: cx,
|
||||
set: NodeSet(),
|
||||
|
@ -245,7 +245,7 @@ pub fn get_trait_def_id(cx: &LateContext, path: &[&str]) -> Option<DefId> {
|
||||
pub fn implements_trait<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: ty::Ty<'tcx>, trait_id: DefId) -> bool {
|
||||
cx.tcx.populate_implementations_for_trait_if_necessary(trait_id);
|
||||
|
||||
let infcx = infer::new_infer_ctxt(cx.tcx, &cx.tcx.tables, None, true);
|
||||
let infcx = infer::new_infer_ctxt(cx.tcx, &cx.tcx.tables, None);
|
||||
let obligation = traits::predicate_for_trait_def(cx.tcx,
|
||||
traits::ObligationCause::dummy(),
|
||||
trait_id, 0, ty,
|
||||
|
@ -1,5 +1,4 @@
|
||||
#![feature(plugin)]
|
||||
#![feature(convert)]
|
||||
#![plugin(clippy)]
|
||||
|
||||
#![deny(clippy)]
|
||||
|
Loading…
Reference in New Issue
Block a user