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

Commit e33f4e6

Browse files
committed
Upgrade clippy to unbreak RLS toolstate
1 parent a55d7e7 commit e33f4e6

File tree

5 files changed

+75
-34
lines changed

5 files changed

+75
-34
lines changed

Cargo.lock

+71-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ anyhow = "1.0.26"
3434
cargo = { git = "https://github.com/rust-lang/cargo", rev = "8dd533662007374412f460b4e442d3f8c193bff9" }
3535
cargo-util = { git = "https://github.com/rust-lang/cargo", rev = "8dd533662007374412f460b4e442d3f8c193bff9" }
3636
cargo_metadata = "0.8"
37-
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "7ea7cd165ad6705603852771bf82cc2fd6560db5", optional = true }
37+
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "a55912c48e4ac08c0ac39a2d562b44699fa20d4d", optional = true }
3838
env_logger = "0.7"
3939
home = "0.5.1"
4040
itertools = "0.9"

rls-rustc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ categories = ["development-tools"]
1212
env_logger = "0.7"
1313
log = "0.4"
1414
rand = "0.7"
15-
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "d236b30a1d638340aad8345fa2946cfe9543dcf0", optional = true }
15+
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "a55912c48e4ac08c0ac39a2d562b44699fa20d4d", optional = true }
1616
tokio = { version = "0.2", optional = true }
1717
futures = { version = "0.3", optional = true }
1818
serde = { version = "1", features = ["derive"], optional = true }

rls-rustc/src/clippy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pub fn config(config: &mut rustc_interface::interface::Config) {
5757
(previous)(sess, lint_store);
5858
}
5959

60-
let conf = clippy_lints::read_conf(&[], &sess);
60+
let conf = clippy_lints::read_conf(&sess);
6161
clippy_lints::register_plugins(&mut lint_store, &sess, &conf);
6262
clippy_lints::register_pre_expansion_lints(&mut lint_store);
6363
clippy_lints::register_renamed(&mut lint_store);

rls/src/build/rustc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ fn clippy_config(config: &mut interface::Config) {
319319
(previous)(sess, lint_store);
320320
}
321321

322-
let conf = clippy_lints::read_conf(&[], &sess);
322+
let conf = clippy_lints::read_conf(&sess);
323323
clippy_lints::register_plugins(&mut lint_store, &sess, &conf);
324324
clippy_lints::register_pre_expansion_lints(&mut lint_store);
325325
clippy_lints::register_renamed(&mut lint_store);

0 commit comments

Comments
 (0)