rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update to rustc 1.7.0-nightly (d0bac3f14 2016-01-18)

Browse Source
This commit is contained in:
mcarton
2016-01-18 13:27:42 +01:00
parent b5f65ec699
commit 21ba315102
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bit_mask.rs
View File

@@ -278,7 +278,7 @@ fn fetch_int_literal(cx: &LateContext, lit: &Expr) -> Option<u64> {
_ => None, _ => 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)) .and_then(|l| fetch_int_literal(cx, l))
} }
_ => None, _ => None,

2
src/consts.rs
View File

@@ -486,7 +486,7 @@ impl<'c, 'cc> ConstEvalLateContext<'c, 'cc> {
} }
// separate if lets to avoid double borrowing the def_map // separate if lets to avoid double borrowing the def_map
if let Some(id) = maybe_id { 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); let ret = self.expr(const_expr);
if ret.is_some() { if ret.is_some() {
self.needed_resolution = true; self.needed_resolution = true;

2
src/escape.rs
View File

@@ -45,7 +45,7 @@ impl LintPass for EscapePass {
impl LateLintPass for EscapePass { impl LateLintPass for EscapePass {
fn check_fn(&mut self, cx: &LateContext, _: visit::FnKind, decl: &FnDecl, body: &Block, _: Span, id: NodeId) { 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 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 { let mut v = EscapeDelegate {
cx: cx, cx: cx,
set: NodeSet(), set: NodeSet(),

2
src/utils.rs
View File

@@ -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 { 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); 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, let obligation = traits::predicate_for_trait_def(cx.tcx,
traits::ObligationCause::dummy(), traits::ObligationCause::dummy(),
trait_id, 0, ty, trait_id, 0, ty,

1
tests/compile-fail/needless_features.rs
View File

@@ -1,5 +1,4 @@
#![feature(plugin)] #![feature(plugin)]
#![feature(convert)]
#![plugin(clippy)] #![plugin(clippy)]
#![deny(clippy)] #![deny(clippy)]