Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit 7a83edc

Browse files
committed
Auto merge of #1413 - Xanewok:bump-clippy, r=Xanewok
Bump clippy Closes #1412.
2 parents 8976875 + fcbdb0c commit 7a83edc

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ rls-vfs = "0.7"
3131

3232
cargo = { git = "https://github.com/rust-lang/cargo", rev = "ed858daaf7c62f6f2156c47d00b0c669bcf9b183" }
3333
cargo_metadata = "0.7"
34-
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "92612c9de159889f77f05855a77482ee1d895f51", optional = true }
34+
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "25a11568fc5b995c2641560415e97244165dd278", optional = true }
3535
env_logger = "0.6"
3636
failure = "0.1.1"
3737
home = "0.3"

rls/src/actions/post_build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ impl PostBuildHandler {
110110
error: &failure::Error,
111111
stdout: &str,
112112
) {
113-
use crate::lsp_data::{Diagnostic, Position};
113+
use crate::lsp_data::Position;
114114
use std::fmt::Write;
115115

116116
// These notifications will include empty sets of errors for files

rls/src/build/rustc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ fn clippy_after_parse_callback(compiler: &interface::Compiler) {
262262
ls.register_early_pass(Some(sess), true, false, pass);
263263
}
264264
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);
266266
}
267267

268268
for (name, (to, deprecated_name)) in lint_groups {

0 commit comments

Comments
 (0)