Auto merge of #1413 - Xanewok:bump-clippy, r=Xanewok

bors · bors · commit 7a83edc9dfc1 · 2019-04-03T13:57:59.000Z
Bump clippy Closes #1412.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,7 +31,7 @@ rls-vfs = "0.7"
 
 cargo = { git = "https://github.com/rust-lang/cargo", rev = "ed858daaf7c62f6f2156c47d00b0c669bcf9b183" }
 cargo_metadata = "0.7"
-clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "92612c9de159889f77f05855a77482ee1d895f51", optional = true }
+clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "25a11568fc5b995c2641560415e97244165dd278", optional = true }
 env_logger = "0.6"
 failure = "0.1.1"
 home = "0.3"
diff --git a/rls/src/actions/post_build.rs b/rls/src/actions/post_build.rs
@@ -110,7 +110,7 @@ impl PostBuildHandler {
         error: &failure::Error,
         stdout: &str,
     ) {
-        use crate::lsp_data::{Diagnostic, Position};
+        use crate::lsp_data::Position;
         use std::fmt::Write;
 
         // These notifications will include empty sets of errors for files
diff --git a/rls/src/build/rustc.rs b/rls/src/build/rustc.rs
@@ -262,7 +262,7 @@ fn clippy_after_parse_callback(compiler: &interface::Compiler) {
         ls.register_early_pass(Some(sess), true, false, pass);
     }
     for pass in late_lint_passes {
-        ls.register_late_pass(Some(sess), true, pass);
+        ls.register_late_pass(Some(sess), true, false, false, pass);
     }
 
     for (name, (to, deprecated_name)) in lint_groups {

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ fn clippy_after_parse_callback(compiler: &interface::Compiler) {`
`262`	`262`	`ls.register_early_pass(Some(sess), true, false, pass);`
`263`	`263`	`}`
`264`	`264`	`for pass in late_lint_passes {`
`265`		`- ls.register_late_pass(Some(sess), true, pass);`
	`265`	`+ ls.register_late_pass(Some(sess), true, false, false, pass);`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`for (name, (to, deprecated_name)) in lint_groups {`