Skip to content

Commit 6064b5d

Browse files
committed
Reverting dependency change for clippy
1 parent f113535 commit 6064b5d

File tree

4 files changed

+30
-10
lines changed

4 files changed

+30
-10
lines changed

Cargo.lock

+25-6
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@ dependencies = [
4747
"zerocopy",
4848
]
4949

50+
[[package]]
51+
name = "aho-corasick"
52+
version = "0.7.20"
53+
source = "registry+https://github.com/rust-lang/crates.io-index"
54+
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
55+
dependencies = [
56+
"memchr",
57+
]
58+
5059
[[package]]
5160
name = "aho-corasick"
5261
version = "1.0.2"
@@ -577,11 +586,11 @@ dependencies = [
577586
name = "clippy_dev"
578587
version = "0.0.1"
579588
dependencies = [
580-
"aho-corasick",
589+
"aho-corasick 0.7.20",
581590
"clap",
582591
"indoc",
583592
"itertools",
584-
"opener",
593+
"opener 0.5.2",
585594
"shell-escape",
586595
"walkdir",
587596
]
@@ -591,7 +600,7 @@ name = "clippy_lints"
591600
version = "0.1.77"
592601
dependencies = [
593602
"arrayvec",
594-
"cargo_metadata 0.18.0",
603+
"cargo_metadata 0.15.4",
595604
"clippy_config",
596605
"clippy_utils",
597606
"declare_clippy_lint",
@@ -1583,7 +1592,7 @@ version = "0.4.13"
15831592
source = "registry+https://github.com/rust-lang/crates.io-index"
15841593
checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
15851594
dependencies = [
1586-
"aho-corasick",
1595+
"aho-corasick 1.0.2",
15871596
"bstr",
15881597
"fnv",
15891598
"log",
@@ -2332,7 +2341,7 @@ dependencies = [
23322341
"log",
23332342
"memchr",
23342343
"once_cell",
2335-
"opener",
2344+
"opener 0.6.1",
23362345
"pathdiff",
23372346
"pulldown-cmark",
23382347
"regex",
@@ -2608,6 +2617,16 @@ version = "1.18.0"
26082617
source = "registry+https://github.com/rust-lang/crates.io-index"
26092618
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
26102619

2620+
[[package]]
2621+
name = "opener"
2622+
version = "0.5.2"
2623+
source = "registry+https://github.com/rust-lang/crates.io-index"
2624+
checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005"
2625+
dependencies = [
2626+
"bstr",
2627+
"winapi",
2628+
]
2629+
26112630
[[package]]
26122631
name = "opener"
26132632
version = "0.6.1"
@@ -3140,7 +3159,7 @@ version = "1.8.4"
31403159
source = "registry+https://github.com/rust-lang/crates.io-index"
31413160
checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
31423161
dependencies = [
3143-
"aho-corasick",
3162+
"aho-corasick 1.0.2",
31443163
"memchr",
31453164
"regex-syntax 0.7.2",
31463165
]

src/tools/clippy/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 = "1.0"
7+
aho-corasick = "0.7"
88
clap = "4.1.4"
99
indoc = "1.0"
1010
itertools = "0.11"
11-
opener = "0.6"
11+
opener = "0.5"
1212
shell-escape = "0.1"
1313
walkdir = "2.3"
1414

src/tools/clippy/clippy_dev/src/update_lints.rs

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

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

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

src/tools/clippy/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.18"
13+
cargo_metadata = "0.15.3"
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)