From c7df4bd0008bb8aad4373457995f56dde861fb8a Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 5 Nov 2015 08:20:28 +0530 Subject: [PATCH] Rustup to rustc 1.6.0-nightly (effcd2965 2015-11-04) fixes #437 --- Cargo.toml | 2 +- src/matches.rs | 2 +- src/misc.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4091a6b1cafe..f9eceabfc852 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clippy" -version = "0.0.22" +version = "0.0.23" authors = [ "Manish Goregaokar ", "Andre Bogus ", diff --git a/src/matches.rs b/src/matches.rs index fb000c24364b..eaa3e0026a3d 100644 --- a/src/matches.rs +++ b/src/matches.rs @@ -38,7 +38,7 @@ impl LateLintPass for MatchPass { // since the exhaustiveness check will ensure the last one is a catch-all, // but in some cases, an explicit match is preferred to catch situations // when an enum is extended, so we don't consider these cases - arms[1].pats[0].node == PatWild(PatWildSingle) && + arms[1].pats[0].node == PatWild && // we don't want any content in the second arm (unit or empty block) is_unit_expr(&arms[1].body) && // finally, MATCH_BOOL doesn't apply here diff --git a/src/misc.rs b/src/misc.rs index 497bb6692c70..01ecb2c2cf80 100644 --- a/src/misc.rs +++ b/src/misc.rs @@ -252,7 +252,7 @@ impl LintPass for PatternPass { impl LateLintPass for PatternPass { fn check_pat(&mut self, cx: &LateContext, pat: &Pat) { if let PatIdent(_, ref ident, Some(ref right)) = pat.node { - if right.node == PatWild(PatWildSingle) { + if right.node == PatWild { cx.span_lint(REDUNDANT_PATTERN, pat.span, &format!( "the `{} @ _` pattern can be written as just `{}`", ident.node.name, ident.node.name));