From: Oliver Schneider <oli-obk@users.noreply.github.com>
Date: Thu, 25 Jan 2018 08:02:05 +0000 (+0100)
Subject: Merge pull request #2399 from rust-lang-nursery/rustup
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=78120382068de39c8d61b40579f2ff1d5f1eea91;hp=c85f651cfd8aed5ebd21007959602b6821df8f39;p=rust.git

Merge pull request #2399 from rust-lang-nursery/rustup

Rustup to rustc 1.25.0-nightly (a0dcecff9 2018-01-24)
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c202f256e3b..6140de473a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 0.0.182
+* Rustup to *rustc 1.25.0-nightly (a0dcecff9 2018-01-24)*
+* New lint: [`decimal_literal_representation`]
+
 ## 0.0.181
 * Rustup to *rustc 1.25.0-nightly (97520ccb1 2018-01-21)*
 * New lints: [`else_if_without_else`], [`option_option`], [`unit_arg`], [`unnecessary_fold`]
@@ -540,6 +544,7 @@ All notable changes to this project will be documented in this file.
 [`const_static_lifetime`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#const_static_lifetime
 [`crosspointer_transmute`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#crosspointer_transmute
 [`cyclomatic_complexity`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#cyclomatic_complexity
+[`decimal_literal_representation`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#decimal_literal_representation
 [`deprecated_semver`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#deprecated_semver
 [`deref_addrof`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#deref_addrof
 [`derive_hash_xor_eq`]: https://rust-lang-nursery.github.io/rust-clippy/master/index.html#derive_hash_xor_eq
diff --git a/Cargo.toml b/Cargo.toml
index 23147c6e707..c285dd10140 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "clippy"
-version = "0.0.181"
+version = "0.0.182"
 authors = [
 	"Manish Goregaokar <manishsmail@gmail.com>",
 	"Andre Bogus <bogusandre@gmail.com>",
@@ -37,7 +37,7 @@ path = "src/driver.rs"
 
 [dependencies]
 # begin automatic update
-clippy_lints = { version = "0.0.181", path = "clippy_lints" }
+clippy_lints = { version = "0.0.182", path = "clippy_lints" }
 # end automatic update
 cargo_metadata = "0.2"
 regex = "0.2"
diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml
index 380fc1369ba..1616b6f1ef0 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.181"
+version = "0.0.182"
 # end automatic update
 authors = [
 	"Manish Goregaokar <manishsmail@gmail.com>",
diff --git a/clippy_lints/src/enum_glob_use.rs b/clippy_lints/src/enum_glob_use.rs
index 9aa43653ab5..c00cdc07f84 100644
--- a/clippy_lints/src/enum_glob_use.rs
+++ b/clippy_lints/src/enum_glob_use.rs
@@ -12,7 +12,8 @@
 /// an enumeration variant, rather than importing variants.
 ///
 /// **Known problems:** Old-style enumerations that prefix the variants are
-/// still around.
+/// still around. May cause problems with modules that are not snake_case (see
+/// [#2397](https://github.com/rust-lang-nursery/rust-clippy/issues/2397))
 ///
 /// **Example:**
 /// ```rust
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
index 037b9f82729..3920b7e6c68 100644
--- a/clippy_lints/src/lib.rs
+++ b/clippy_lints/src/lib.rs
@@ -490,10 +490,10 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
         let_if_seq::USELESS_LET_IF_SEQ,
         lifetimes::NEEDLESS_LIFETIMES,
         lifetimes::UNUSED_LIFETIMES,
+        literal_representation::DECIMAL_LITERAL_REPRESENTATION,
         literal_representation::INCONSISTENT_DIGIT_GROUPING,
         literal_representation::LARGE_DIGIT_GROUPS,
         literal_representation::UNREADABLE_LITERAL,
-        literal_representation::DECIMAL_LITERAL_REPRESENTATION,
         loops::EMPTY_LOOP,
         loops::EXPLICIT_COUNTER_LOOP,
         loops::EXPLICIT_INTO_ITER_LOOP,
diff --git a/clippy_lints/src/misc_early.rs b/clippy_lints/src/misc_early.rs
index 4e45525ed09..8ac0c4bf098 100644
--- a/clippy_lints/src/misc_early.rs
+++ b/clippy_lints/src/misc_early.rs
@@ -296,7 +296,7 @@ fn check_expr(&mut self, cx: &EarlyContext, expr: &Expr) {
         }
         match expr.node {
             ExprKind::Call(ref paren, _) => if let ExprKind::Paren(ref closure) = paren.node {
-                if let ExprKind::Closure(_, ref decl, ref block, _) = closure.node {
+                if let ExprKind::Closure(_, _, ref decl, ref block, _) = closure.node {
                     span_lint_and_then(
                         cx,
                         REDUNDANT_CLOSURE_CALL,
@@ -327,7 +327,7 @@ fn check_block(&mut self, cx: &EarlyContext, block: &Block) {
             if_chain! {
                 if let StmtKind::Local(ref local) = w[0].node;
                 if let Option::Some(ref t) = local.init;
-                if let ExprKind::Closure(_, _, _, _) = t.node;
+                if let ExprKind::Closure(_, _, _, _, _) = t.node;
                 if let PatKind::Ident(_, sp_ident, _) = local.pat.node;
                 if let StmtKind::Semi(ref second) = w[1].node;
                 if let ExprKind::Assign(_, ref call) = second.node;