Skip to content

Commit

Permalink
Reverting dependency change for clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelciraci committed Jan 21, 2024
1 parent f113535 commit 6064b5d
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 10 deletions.
31 changes: 25 additions & 6 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ dependencies = [
"zerocopy",
]

[[package]]
name = "aho-corasick"
version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
dependencies = [
"memchr",
]

[[package]]
name = "aho-corasick"
version = "1.0.2"
Expand Down Expand Up @@ -577,11 +586,11 @@ dependencies = [
name = "clippy_dev"
version = "0.0.1"
dependencies = [
"aho-corasick",
"aho-corasick 0.7.20",
"clap",
"indoc",
"itertools",
"opener",
"opener 0.5.2",
"shell-escape",
"walkdir",
]
Expand All @@ -591,7 +600,7 @@ name = "clippy_lints"
version = "0.1.77"
dependencies = [
"arrayvec",
"cargo_metadata 0.18.0",
"cargo_metadata 0.15.4",
"clippy_config",
"clippy_utils",
"declare_clippy_lint",
Expand Down Expand Up @@ -1583,7 +1592,7 @@ version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
dependencies = [
"aho-corasick",
"aho-corasick 1.0.2",
"bstr",
"fnv",
"log",
Expand Down Expand Up @@ -2332,7 +2341,7 @@ dependencies = [
"log",
"memchr",
"once_cell",
"opener",
"opener 0.6.1",
"pathdiff",
"pulldown-cmark",
"regex",
Expand Down Expand Up @@ -2608,6 +2617,16 @@ version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"

[[package]]
name = "opener"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005"
dependencies = [
"bstr",
"winapi",
]

[[package]]
name = "opener"
version = "0.6.1"
Expand Down Expand Up @@ -3140,7 +3159,7 @@ version = "1.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
dependencies = [
"aho-corasick",
"aho-corasick 1.0.2",
"memchr",
"regex-syntax 0.7.2",
]
Expand Down
4 changes: 2 additions & 2 deletions src/tools/clippy/clippy_dev/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ version = "0.0.1"
edition = "2021"

[dependencies]
aho-corasick = "1.0"
aho-corasick = "0.7"
clap = "4.1.4"
indoc = "1.0"
itertools = "0.11"
opener = "0.6"
opener = "0.5"
shell-escape = "0.1"
walkdir = "2.3"

Expand Down
3 changes: 2 additions & 1 deletion src/tools/clippy/clippy_dev/src/update_lints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,9 @@ fn replace_ident_like(contents: &str, replacements: &[(&str, &str)]) -> Option<S
}

let searcher = AhoCorasickBuilder::new()
.dfa(true)
.match_kind(aho_corasick::MatchKind::LeftmostLongest)
.build(replacements.iter().map(|&(x, _)| x.as_bytes()))
.build_with_size::<u16, _, _>(replacements.iter().map(|&(x, _)| x.as_bytes()))
.unwrap();

let mut result = String::with_capacity(contents.len() + 1024);
Expand Down
2 changes: 1 addition & 1 deletion src/tools/clippy/clippy_lints/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2021"

[dependencies]
arrayvec = { version = "0.7", default-features = false }
cargo_metadata = "0.18"
cargo_metadata = "0.15.3"
clippy_config = { path = "../clippy_config" }
clippy_utils = { path = "../clippy_utils" }
declare_clippy_lint = { path = "../declare_clippy_lint" }
Expand Down

0 comments on commit 6064b5d

Please sign in to comment.