Skip to content

Commit 8a17125

Browse files
committed
Auto merge of #12184 - michaelciraci:merge-deps, r=llogiq
Consolidating rustc Dependencies changelog: none For dependencies in rustc where there are multiple versions used, this moves the older dependency to the newer dependency. These are the updates to clippy as mentioned here: rust-lang/rust#120177
2 parents 900a5aa + af76e3e commit 8a17125

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

clippy_dev/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ version = "0.0.1"
44
edition = "2021"
55

66
[dependencies]
7-
aho-corasick = "0.7"
7+
aho-corasick = "1.0"
88
clap = "4.1.4"
99
indoc = "1.0"
1010
itertools = "0.11"
11-
opener = "0.5"
11+
opener = "0.6"
1212
shell-escape = "0.1"
1313
walkdir = "2.3"
1414

clippy_dev/src/update_lints.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -504,9 +504,8 @@ fn replace_ident_like(contents: &str, replacements: &[(&str, &str)]) -> Option<S
504504
}
505505

506506
let searcher = AhoCorasickBuilder::new()
507-
.dfa(true)
508507
.match_kind(aho_corasick::MatchKind::LeftmostLongest)
509-
.build_with_size::<u16, _, _>(replacements.iter().map(|&(x, _)| x.as_bytes()))
508+
.build(replacements.iter().map(|&(x, _)| x.as_bytes()))
510509
.unwrap();
511510

512511
let mut result = String::with_capacity(contents.len() + 1024);

clippy_lints/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2021"
1010

1111
[dependencies]
1212
arrayvec = { version = "0.7", default-features = false }
13-
cargo_metadata = "0.15.3"
13+
cargo_metadata = "0.18"
1414
clippy_config = { path = "../clippy_config" }
1515
clippy_utils = { path = "../clippy_utils" }
1616
declare_clippy_lint = { path = "../declare_clippy_lint" }

0 commit comments

Comments
 (0)