diff options
| author | bors <bors@rust-lang.org> | 2024-01-25 16:31:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-25 16:31:26 +0000 |
| commit | 8a17125dd714bb042a901215e120aa830a4b4742 (patch) | |
| tree | 4ab15ddd7ed567a6cc35cd5d0c3b787310ee4248 | |
| parent | 900a5aa036c6070fdec8acd6d871a4bfc89b2fb4 (diff) | |
| parent | af76e3ed98e959a7045e8eea215d554591793ed6 (diff) | |
| download | rust-8a17125dd714bb042a901215e120aa830a4b4742.tar.gz rust-8a17125dd714bb042a901215e120aa830a4b4742.zip | |
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: https://github.com/rust-lang/rust/pull/120177
| -rw-r--r-- | clippy_dev/Cargo.toml | 4 | ||||
| -rw-r--r-- | clippy_dev/src/update_lints.rs | 3 | ||||
| -rw-r--r-- | clippy_lints/Cargo.toml | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/clippy_dev/Cargo.toml b/clippy_dev/Cargo.toml index ce738e3f4ec..5ec67554e7d 100644 --- a/clippy_dev/Cargo.toml +++ b/clippy_dev/Cargo.toml @@ -4,11 +4,11 @@ version = "0.0.1" edition = "2021" [dependencies] -aho-corasick = "0.7" +aho-corasick = "1.0" clap = "4.1.4" indoc = "1.0" itertools = "0.11" -opener = "0.5" +opener = "0.6" shell-escape = "0.1" walkdir = "2.3" diff --git a/clippy_dev/src/update_lints.rs b/clippy_dev/src/update_lints.rs index 6b76a44debf..9a357466923 100644 --- a/clippy_dev/src/update_lints.rs +++ b/clippy_dev/src/update_lints.rs @@ -504,9 +504,8 @@ fn replace_ident_like(contents: &str, replacements: &[(&str, &str)]) -> Option<S } let searcher = AhoCorasickBuilder::new() - .dfa(true) .match_kind(aho_corasick::MatchKind::LeftmostLongest) - .build_with_size::<u16, _, _>(replacements.iter().map(|&(x, _)| x.as_bytes())) + .build(replacements.iter().map(|&(x, _)| x.as_bytes())) .unwrap(); let mut result = String::with_capacity(contents.len() + 1024); diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml index 8cba35f3d87..416e9a680dd 100644 --- a/clippy_lints/Cargo.toml +++ b/clippy_lints/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] arrayvec = { version = "0.7", default-features = false } -cargo_metadata = "0.15.3" +cargo_metadata = "0.18" clippy_config = { path = "../clippy_config" } clippy_utils = { path = "../clippy_utils" } declare_clippy_lint = { path = "../declare_clippy_lint" } |