Merge pull request #1004 from Manishearth/rustup

Rustup to *1.11.0-nightly (7d2f75a 2016-06-09)*

Author: mcarton

CHANGELOG.md

@@ -2,6 +2,7 @@
 All notable changes to this project will be documented in this file.
 
 ## 0.0.76 — TBD
+* Rustup to *rustc 1.11.0-nightly (7d2f75a95 2016-06-09)*
 * `cargo clippy` now automatically defines the `clippy` feature
 
 ## 0.0.75 — 2016-06-08

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "clippy"
-version = "0.0.75"
+version = "0.0.76"
 authors = [
 	"Manish Goregaokar <[email protected]>",
 	"Andre Bogus <[email protected]>",
@@ -25,7 +25,7 @@ test = false
 [dependencies]
 regex_macros = { version = "0.1.33", optional = true }
 # begin automatic update
-clippy_lints = { version = "0.0.75", path = "clippy_lints" }
+clippy_lints = { version = "0.0.76", path = "clippy_lints" }
 # end automatic update
 
 [dev-dependencies]

clippy_lints/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "clippy_lints"
 # begin automatic update
-version = "0.0.75"
+version = "0.0.76"
 # end automatic update
 authors = [
 	"Manish Goregaokar <[email protected]>",

clippy_lints/src/drop_ref.rs

@@ -35,7 +35,7 @@ impl LateLintPass for DropRefPass {
     fn check_expr(&mut self, cx: &LateContext, expr: &Expr) {
         if let ExprCall(ref path, ref args) = expr.node {
             if let ExprPath(None, _) = path.node {
-                let def_id = cx.tcx.def_map.borrow()[&path.id].def_id();
+                let def_id = cx.tcx.expect_def(path.id).def_id();
                 if match_def_path(cx, def_id, &paths::DROP) {
                     if args.len() != 1 {
                         return;

clippy_lints/src/enum_glob_use.rs

@@ -44,14 +44,14 @@ impl EnumGlobUse {
         if let ItemUse(ref item_use) = item.node {
             if let ViewPath_::ViewPathGlob(_) = item_use.node {
                 if let Some(def) = cx.tcx.def_map.borrow().get(&item.id) {
-                    if let Some(node_id) = cx.tcx.map.as_local_node_id(def.def_id()) {
+                    if let Some(node_id) = cx.tcx.map.as_local_node_id(def.full_def().def_id()) {
                         if let Some(NodeItem(it)) = cx.tcx.map.find(node_id) {
                             if let ItemEnum(..) = it.node {
                                 span_lint(cx, ENUM_GLOB_USE, item.span, "don't use glob imports for enum variants");
                             }
                         }
                     } else {
-                        let child = cx.sess().cstore.item_children(def.def_id());
+                        let child = cx.sess().cstore.item_children(def.full_def().def_id());
                         if let Some(child) = child.first() {
                             if let DefLike::DlDef(Def::Variant(..)) = child.def {
                                 span_lint(cx, ENUM_GLOB_USE, item.span, "don't use glob imports for enum variants");

clippy_lints/src/let_if_seq.rs

@@ -69,15 +69,15 @@ impl LateLintPass for LetIfSeq {
                 let Some(def) = cx.tcx.def_map.borrow().get(&decl.pat.id),
                 let hir::StmtExpr(ref if_, _) = expr.node,
                 let hir::ExprIf(ref cond, ref then, ref else_) = if_.node,
-                !used_in_expr(cx, def.def_id(), cond),
-                let Some(value) = check_assign(cx, def.def_id(), then),
-                !used_in_expr(cx, def.def_id(), value),
+                !used_in_expr(cx, def.full_def().def_id(), cond),
+                let Some(value) = check_assign(cx, def.full_def().def_id(), then),
+                !used_in_expr(cx, def.full_def().def_id(), value),
             ], {
                 let span = codemap::mk_sp(stmt.span.lo, if_.span.hi);
 
                 let (default_multi_stmts, default) = if let Some(ref else_) = *else_ {
                     if let hir::ExprBlock(ref else_) = else_.node {
-                        if let Some(default) = check_assign(cx, def.def_id(), else_) {
+                        if let Some(default) = check_assign(cx, def.full_def().def_id(), else_) {
                             (else_.stmts.len() > 1, default)
                         } else if let Some(ref default) = decl.init {
                             (true, &**default)
@@ -139,7 +139,7 @@ impl<'a, 'tcx, 'v> hir::intravisit::Visitor<'v> for UsedVisitor<'a, 'tcx> {
         if_let_chain! {[
             let hir::ExprPath(None, _) = expr.node,
             let Some(def) = self.cx.tcx.def_map.borrow().get(&expr.id),
-            self.id == def.def_id(),
+            self.id == def.full_def().def_id(),
         ], {
             self.used = true;
             return;
@@ -156,7 +156,7 @@ fn check_assign<'e>(cx: &LateContext, decl: hir::def_id::DefId, block: &'e hir::
         let hir::ExprAssign(ref var, ref value) = expr.node,
         let hir::ExprPath(None, _) = var.node,
         let Some(def) = cx.tcx.def_map.borrow().get(&var.id),
-        decl == def.def_id(),
+        decl == def.full_def().def_id(),
     ], {
         let mut v = UsedVisitor {
             cx: cx,

clippy_lints/src/mem_forget.rs

@@ -27,7 +27,7 @@ impl LateLintPass for MemForget {
     fn check_expr(&mut self, cx: &LateContext, e: &Expr) {
         if let ExprCall(ref path_expr, ref args) = e.node {
             if let ExprPath(None, _) = path_expr.node {
-                let def_id = cx.tcx.def_map.borrow()[&path_expr.id].def_id();
+                let def_id = cx.tcx.expect_def(path_expr.id).def_id();
                 if match_def_path(cx, def_id, &paths::MEM_FORGET) {
                     let forgot_ty = cx.tcx.expr_ty(&args[0]);
 

clippy_lints/src/minmax.rs

@@ -55,7 +55,7 @@ enum MinMax {
 fn min_max<'a>(cx: &LateContext, expr: &'a Expr) -> Option<(MinMax, Constant, &'a Expr)> {
     if let ExprCall(ref path, ref args) = expr.node {
         if let ExprPath(None, _) = path.node {
-            let def_id = cx.tcx.def_map.borrow()[&path.id].def_id();
+            let def_id = cx.tcx.expect_def(path.id).def_id();
 
             if match_def_path(cx, def_id, &paths::CMP_MIN) {
                 fetch_const(args, MinMax::Min)

clippy_lints/src/needless_bool.rs

@@ -155,8 +155,8 @@ enum Expression {
 
 fn fetch_bool_block(block: &Block) -> Expression {
     match (&*block.stmts, block.expr.as_ref()) {
-        ([], Some(e)) => fetch_bool_expr(&**e),
-        ([ref e], None) => {
+        (&[], Some(e)) => fetch_bool_expr(&**e),
+        (&[ref e], None) => {
             if let StmtSemi(ref e, _) = e.node {
                 if let ExprRet(_) = e.node {
                     fetch_bool_expr(&**e)

clippy_lints/src/regex.rs

@@ -103,7 +103,7 @@ impl LateLintPass for RegexPass {
             args.len() == 1,
             let Some(def) = cx.tcx.def_map.borrow().get(&fun.id),
         ], {
-            let def_id = def.def_id();
+            let def_id = def.full_def().def_id();
             if match_def_path(cx, def_id, &paths::REGEX_NEW) ||
                match_def_path(cx, def_id, &paths::REGEX_BUILDER_NEW) {
                 check_regex(cx, &args[0], true);