From 89f0f323bb9bcb78cc9f6ace99ad44df5617483c Mon Sep 17 00:00:00 2001 From: Mrmaxmeier Date: Sun, 16 Apr 2017 18:38:17 +0200 Subject: [PATCH 1/2] Rustup to 1.18.0-nightly (d5cf1cb64 2017-04-15) --- clippy_lints/src/missing_doc.rs | 1 + clippy_lints/src/utils/inspector.rs | 1 + clippy_lints/src/utils/mod.rs | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/clippy_lints/src/missing_doc.rs b/clippy_lints/src/missing_doc.rs index 1249b638a08..c38402ad29c 100644 --- a/clippy_lints/src/missing_doc.rs +++ b/clippy_lints/src/missing_doc.rs @@ -122,6 +122,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDoc { hir::ItemStatic(..) => "a static", hir::ItemStruct(..) => "a struct", hir::ItemTrait(..) => "a trait", + hir::ItemGlobalAsm(..) => "an assembly blob", hir::ItemTy(..) => "a type alias", hir::ItemUnion(..) => "a union", hir::ItemDefaultImpl(..) | diff --git a/clippy_lints/src/utils/inspector.rs b/clippy_lints/src/utils/inspector.rs index 66c1ba89353..b38cc8a15be 100644 --- a/clippy_lints/src/utils/inspector.rs +++ b/clippy_lints/src/utils/inspector.rs @@ -372,6 +372,7 @@ fn print_item(cx: &LateContext, item: &hir::Item) { }, hir::ItemMod(..) => println!("module"), hir::ItemForeignMod(ref fm) => println!("foreign module with abi: {}", fm.abi), + hir::ItemGlobalAsm(ref asm) => println!("global asm: {:?}", asm), hir::ItemTy(..) => { println!("type alias for {:?}", cx.tcx.item_type(did)); }, diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index 87b43062631..f5f88c572e3 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -904,7 +904,8 @@ pub fn opt_def_id(def: Def) -> Option { Def::AssociatedConst(id) | Def::Local(id) | Def::Upvar(id, ..) | - Def::Macro(id, _) => Some(id), + Def::Macro(id, ..) | + Def::GlobalAsm(id) => Some(id), Def::Label(..) | Def::PrimTy(..) | Def::SelfTy(..) | Def::Err => None, } From c4b94f9044c44d38810b5216955999b8dde6503f Mon Sep 17 00:00:00 2001 From: mcarton Date: Sun, 16 Apr 2017 23:51:55 +0200 Subject: [PATCH 2/2] Bump to 0.0.124 --- CHANGELOG.md | 3 +++ Cargo.toml | 4 ++-- clippy_lints/Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92e6048ea44..383bf56bd0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Change Log All notable changes to this project will be documented in this file. +## 0.0.124 — 2017-04-16 +* Update to *rustc 1.18.0-nightly (d5cf1cb64 2017-04-15)* + ## 0.0.123 — 2017-04-07 * Fix various false positives diff --git a/Cargo.toml b/Cargo.toml index bcbe615769a..d66ca3a0242 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clippy" -version = "0.0.123" +version = "0.0.124" authors = [ "Manish Goregaokar ", "Andre Bogus ", @@ -30,7 +30,7 @@ test = false [dependencies] # begin automatic update -clippy_lints = { version = "0.0.123", path = "clippy_lints" } +clippy_lints = { version = "0.0.124", path = "clippy_lints" } # end automatic update cargo_metadata = "0.1.1" diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml index e0d20e42f08..0b5c553d456 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.123" +version = "0.0.124" # end automatic update authors = [ "Manish Goregaokar ",