From 350f3a7fe5948feea550ff6481cb39e5c42b7819 Mon Sep 17 00:00:00 2001 From: mcarton Date: Fri, 10 Jun 2016 19:47:10 +0200 Subject: [PATCH 1/2] Rustup to *1.11.0-nightly (7d2f75a95 2016-06-09)* --- clippy_lints/src/drop_ref.rs | 2 +- clippy_lints/src/enum_glob_use.rs | 4 ++-- clippy_lints/src/let_if_seq.rs | 12 ++++++------ clippy_lints/src/mem_forget.rs | 2 +- clippy_lints/src/minmax.rs | 2 +- clippy_lints/src/needless_bool.rs | 4 ++-- clippy_lints/src/regex.rs | 2 +- clippy_lints/src/transmute.rs | 2 +- clippy_lints/src/types.rs | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/clippy_lints/src/drop_ref.rs b/clippy_lints/src/drop_ref.rs index 69156f15f31..268497f99d4 100644 --- a/clippy_lints/src/drop_ref.rs +++ b/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; diff --git a/clippy_lints/src/enum_glob_use.rs b/clippy_lints/src/enum_glob_use.rs index 37a89069d19..5a4185ec63b 100644 --- a/clippy_lints/src/enum_glob_use.rs +++ b/clippy_lints/src/enum_glob_use.rs @@ -44,14 +44,14 @@ fn lint_item(&self, cx: &LateContext, item: &Item) { 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"); diff --git a/clippy_lints/src/let_if_seq.rs b/clippy_lints/src/let_if_seq.rs index ac6bee00ff5..0ed3248228f 100644 --- a/clippy_lints/src/let_if_seq.rs +++ b/clippy_lints/src/let_if_seq.rs @@ -69,15 +69,15 @@ fn check_block(&mut self, cx: &LateContext, block: &hir::Block) { 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 @@ fn visit_expr(&mut self, expr: &'v hir::Expr) { 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, diff --git a/clippy_lints/src/mem_forget.rs b/clippy_lints/src/mem_forget.rs index 4dfb0fe88e0..79a71436368 100644 --- a/clippy_lints/src/mem_forget.rs +++ b/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]); diff --git a/clippy_lints/src/minmax.rs b/clippy_lints/src/minmax.rs index eaba19b08e4..a88324aaf50 100644 --- a/clippy_lints/src/minmax.rs +++ b/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) diff --git a/clippy_lints/src/needless_bool.rs b/clippy_lints/src/needless_bool.rs index f95d6f5c9c1..5f912366770 100644 --- a/clippy_lints/src/needless_bool.rs +++ b/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) diff --git a/clippy_lints/src/regex.rs b/clippy_lints/src/regex.rs index 8b84f94fa8e..c2c37fcf686 100644 --- a/clippy_lints/src/regex.rs +++ b/clippy_lints/src/regex.rs @@ -103,7 +103,7 @@ fn check_expr(&mut self, cx: &LateContext, expr: &Expr) { 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); diff --git a/clippy_lints/src/transmute.rs b/clippy_lints/src/transmute.rs index 2217fd59bd9..5d3f27b074b 100644 --- a/clippy_lints/src/transmute.rs +++ b/clippy_lints/src/transmute.rs @@ -60,7 +60,7 @@ impl LateLintPass for Transmute { 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::TRANSMUTE) { let from_ty = cx.tcx.expr_ty(&args[0]); diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs index 8a1a13187b3..83e2c1b549c 100644 --- a/clippy_lints/src/types.rs +++ b/clippy_lints/src/types.rs @@ -56,7 +56,7 @@ fn check_ty(&mut self, cx: &LateContext, ast_ty: &Ty) { } if let Some(did) = cx.tcx.def_map.borrow().get(&ast_ty.id) { if let def::Def::Struct(..) = did.full_def() { - if Some(did.def_id()) == cx.tcx.lang_items.owned_box() { + if Some(did.full_def().def_id()) == cx.tcx.lang_items.owned_box() { if_let_chain! {[ let TyPath(_, ref path) = ast_ty.node, let Some(ref last) = path.segments.last(), @@ -64,7 +64,7 @@ fn check_ty(&mut self, cx: &LateContext, ast_ty: &Ty) { let Some(ref vec) = ag.types.get(0), let Some(did) = cx.tcx.def_map.borrow().get(&vec.id), let def::Def::Struct(..) = did.full_def(), - match_def_path(cx, did.def_id(), &paths::VEC), + match_def_path(cx, did.full_def().def_id(), &paths::VEC), ], { span_help_and_lint(cx, BOX_VEC, @@ -72,7 +72,7 @@ fn check_ty(&mut self, cx: &LateContext, ast_ty: &Ty) { "you seem to be trying to use `Box>`. Consider using just `Vec`", "`Vec` is already on the heap, `Box>` makes an extra allocation."); }} - } else if match_def_path(cx, did.def_id(), &paths::LINKED_LIST) { + } else if match_def_path(cx, did.full_def().def_id(), &paths::LINKED_LIST) { span_help_and_lint(cx, LINKEDLIST, ast_ty.span, From 17dd0da9da6eebbb83856bd6a76ac767be0217f0 Mon Sep 17 00:00:00 2001 From: mcarton Date: Fri, 10 Jun 2016 19:48:56 +0200 Subject: [PATCH 2/2] Bump to 0.0.76 --- CHANGELOG.md | 1 + Cargo.toml | 4 ++-- clippy_lints/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4009246507c..81102a900e5 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/Cargo.toml b/Cargo.toml index 12c74b653e3..60862865b43 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clippy" -version = "0.0.75" +version = "0.0.76" authors = [ "Manish Goregaokar ", "Andre Bogus ", @@ -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] diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml index 793e26ad06d..2f748d1ec3c 100644 --- a/clippy_lints/Cargo.toml +++ b/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 ",