Skip to content

Commit e62fd72

Browse files
authored
Rollup merge of #90500 - xFrednet:00000-update-clippy-deps, r=flip1995
Update Clippy dependencies Clippy has two outdated dependencies, where one indirect dependency has been flagged by rustsec for dropping a lifetime. See [RUSTSEC-2020-0146](https://rustsec.org/advisories/RUSTSEC-2020-0146). This PR updates these dependencies. With previous dependency updates, it was tried to prevent duplicates in the `Cargo.lock` file of rust-lang/rust. I've tried to keep this in mind with this update. * Dependency `semver` * Used in `src/tools/cargo/Cargo.toml` as version `1.0.3` * Used in `src/tools/rust-analyzer/crates/project_model/Cargo.toml` as version `1` * Updated in Clippy from `0.11` to `1.0` (Clippy usually defines the major and minor patch version). The `Cargo.lock` file lists `1.0.3` which is one patch version behind the most recent one but prevents a duplicate with cargo's pinned version. * Dependency `cargo_metadata` * Used in several tools as `0.14` * Used in `src/tools/tidy` and `src/tools/rls` as `0.12` * Updated in Clippy from `0.12` to `0.14` All updates to the `Cargo.lock` have been done automatically by `x.py`. There are still some tools with these outdated dependencies. Clippy didn't require any changes, and it would be likely that the others could also be updated without any problem. Let me know if I should try to update them as well 🙃. Keep up the good work, whoever is reading this 🦀 --- For Clippy: changelog: none
2 parents 80d8eac + fd41336 commit e62fd72

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Cargo.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ dependencies = [
576576
name = "clippy"
577577
version = "0.1.58"
578578
dependencies = [
579-
"cargo_metadata 0.12.0",
579+
"cargo_metadata 0.14.0",
580580
"clippy_lints",
581581
"clippy_utils",
582582
"compiletest_rs",
@@ -588,7 +588,7 @@ dependencies = [
588588
"regex",
589589
"rustc-workspace-hack",
590590
"rustc_tools_util 0.2.0",
591-
"semver 0.11.0",
591+
"semver 1.0.3",
592592
"serde",
593593
"syn",
594594
"tempfile",
@@ -613,15 +613,15 @@ dependencies = [
613613
name = "clippy_lints"
614614
version = "0.1.58"
615615
dependencies = [
616-
"cargo_metadata 0.12.0",
616+
"cargo_metadata 0.14.0",
617617
"clippy_utils",
618618
"if_chain",
619619
"itertools 0.10.1",
620620
"pulldown-cmark 0.8.0",
621621
"quine-mc_cluskey",
622622
"regex-syntax",
623623
"rustc-semver",
624-
"semver 0.11.0",
624+
"semver 1.0.3",
625625
"serde",
626626
"serde_json",
627627
"toml",

src/tools/clippy/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ path = "src/driver.rs"
2222

2323
[dependencies]
2424
clippy_lints = { version = "0.1", path = "clippy_lints" }
25-
semver = "0.11"
25+
semver = "1.0"
2626
rustc_tools_util = { version = "0.2", path = "rustc_tools_util" }
2727
tempfile = { version = "3.2", optional = true }
2828

2929
[dev-dependencies]
30-
cargo_metadata = "0.12"
30+
cargo_metadata = "0.14"
3131
compiletest_rs = { version = "0.7", features = ["tmp"] }
3232
tester = "0.9"
3333
regex = "1.5"

src/tools/clippy/clippy_lints/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ keywords = ["clippy", "lint", "plugin"]
99
edition = "2021"
1010

1111
[dependencies]
12-
cargo_metadata = "0.12"
12+
cargo_metadata = "0.14"
1313
clippy_utils = { path = "../clippy_utils" }
1414
if_chain = "1.0"
1515
itertools = "0.10"
@@ -21,7 +21,7 @@ serde_json = { version = "1.0", optional = true }
2121
toml = "0.5"
2222
unicode-normalization = "0.1"
2323
unicode-script = { version = "0.5", default-features = false }
24-
semver = "0.11"
24+
semver = "1.0"
2525
rustc-semver = "1.1"
2626
# NOTE: cargo requires serde feat in its url dep
2727
# see <https://github.com/rust-lang/rust/pull/63587#issuecomment-522343864>

0 commit comments

Comments
 (0)