Skip to content

Update Clippy dependencies without patch versions #88517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 13, 2021
Merged

Update Clippy dependencies without patch versions #88517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83875ea
Prep for upgrade to cargo_metadata 0.14.0
smoelius Sep 1, 2021
a628223
Update dependencies
smoelius Sep 9, 2021
bd4b17a
Update lockfile
smoelius Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 8 additions & 31 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ dependencies = [

[[package]]
name = "aho-corasick"
version = "0.7.13"
version = "0.7.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
dependencies = [
"memchr",
]
Expand Down Expand Up @@ -559,7 +559,7 @@ dependencies = [
"cargo_metadata 0.12.0",
"clippy_lints",
"clippy_utils",
"compiletest_rs 0.6.0",
"compiletest_rs",
"derive-new",
"filetime",
"if_chain",
Expand All @@ -581,7 +581,7 @@ version = "0.0.1"
dependencies = [
"bytecount",
"clap",
"itertools 0.9.0",
"itertools 0.10.1",
"opener",
"regex",
"shell-escape",
Expand All @@ -595,7 +595,7 @@ dependencies = [
"cargo_metadata 0.12.0",
"clippy_utils",
"if_chain",
"itertools 0.9.0",
"itertools 0.10.1",
"pulldown-cmark 0.8.0",
"quine-mc_cluskey",
"regex-syntax",
Expand Down Expand Up @@ -687,29 +687,6 @@ dependencies = [
"winapi",
]

[[package]]
name = "compiletest_rs"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0086d6ad78cf409c3061618cd98e2789d5c9ce598fc9651611cf62eae0a599cb"
dependencies = [
"diff",
"filetime",
"getopts",
"lazy_static",
"libc",
"log",
"miow",
"regex",
"rustfix 0.5.1",
"serde",
"serde_derive",
"serde_json",
"tempfile",
"tester",
"winapi",
]

[[package]]
name = "compiletest_rs"
version = "0.7.0"
Expand Down Expand Up @@ -2272,7 +2249,7 @@ name = "miri"
version = "0.1.0"
dependencies = [
"colored",
"compiletest_rs 0.7.0",
"compiletest_rs",
"env_logger 0.8.1",
"getrandom 0.2.0",
"hex 0.4.2",
Expand Down Expand Up @@ -3005,9 +2982,9 @@ dependencies = [

[[package]]
name = "regex"
version = "1.4.6"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
dependencies = [
"aho-corasick",
"memchr",
Expand Down
22 changes: 10 additions & 12 deletions src/tools/clippy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,37 +21,35 @@ name = "clippy-driver"
path = "src/driver.rs"

[dependencies]
# begin automatic update
clippy_lints = { version = "0.1.50", path = "clippy_lints" }
# end automatic update
clippy_lints = { version = "0.1", path = "clippy_lints" }
semver = "0.11"
rustc_tools_util = { version = "0.2.0", path = "rustc_tools_util" }
tempfile = { version = "3.1.0", optional = true }
rustc_tools_util = { version = "0.2", path = "rustc_tools_util" }
tempfile = { version = "3.2", optional = true }

[dev-dependencies]
cargo_metadata = "0.12"
compiletest_rs = { version = "0.6.0", features = ["tmp"] }
compiletest_rs = { version = "0.7", features = ["tmp"] }
tester = "0.9"
regex = "1.4"
regex = "1.5"
# This is used by the `collect-metadata` alias.
filetime = "0.2"

# A noop dependency that changes in the Rust repository, it's a bit of a hack.
# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
# for more information.
rustc-workspace-hack = "1.0.0"
rustc-workspace-hack = "1.0"

# UI test dependencies
clippy_utils = { path = "clippy_utils" }
derive-new = "0.5"
if_chain = "1.0"
itertools = "0.10.1"
quote = "1"
itertools = "0.10"
quote = "1.0"
serde = { version = "1.0", features = ["derive"] }
syn = { version = "1", features = ["full"] }
syn = { version = "1.0", features = ["full"] }

[build-dependencies]
rustc_tools_util = { version = "0.2.0", path = "rustc_tools_util" }
rustc_tools_util = { version = "0.2", path = "rustc_tools_util" }

[features]
deny-warnings = ["clippy_lints/deny-warnings"]
Expand Down
6 changes: 3 additions & 3 deletions src/tools/clippy/clippy_dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ edition = "2018"
[dependencies]
bytecount = "0.6"
clap = "2.33"
itertools = "0.9"
itertools = "0.10"
opener = "0.5"
regex = "1"
regex = "1.5"
shell-escape = "0.1"
walkdir = "2"
walkdir = "2.3"

[features]
deny-warnings = []
2 changes: 1 addition & 1 deletion src/tools/clippy/clippy_dummy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ keywords = ["clippy", "lint", "plugin"]
categories = ["development-tools", "development-tools::cargo-plugins"]

[build-dependencies]
term = "0.6"
term = "0.7"
14 changes: 7 additions & 7 deletions src/tools/clippy/clippy_lints/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ edition = "2018"
[dependencies]
cargo_metadata = "0.12"
clippy_utils = { path = "../clippy_utils" }
if_chain = "1.0.0"
itertools = "0.9"
if_chain = "1.0"
itertools = "0.10"
pulldown-cmark = { version = "0.8", default-features = false }
quine-mc_cluskey = "0.2.2"
quine-mc_cluskey = "0.2"
regex-syntax = "0.6"
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0", optional = true }
toml = "0.5.3"
toml = "0.5"
unicode-normalization = "0.1"
unicode-script = { version = "0.5.3", default-features = false }
unicode-script = { version = "0.5", default-features = false }
semver = "0.11"
rustc-semver = "1.1.0"
rustc-semver = "1.1"
# NOTE: cargo requires serde feat in its url dep
# see <https://github.com/rust-lang/rust/pull/63587#issuecomment-522343864>
url = { version = "2.1.0", features = ["serde"] }
url = { version = "2.2", features = ["serde"] }

[features]
deny-warnings = ["clippy_utils/deny-warnings"]
Expand Down
14 changes: 4 additions & 10 deletions src/tools/clippy/clippy_lints/src/cargo_common_metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//! lint on missing cargo common metadata

use std::path::PathBuf;

use clippy_utils::{diagnostics::span_lint, is_lint_allowed};
use rustc_hir::{hir_id::CRATE_HIR_ID, Crate};
use rustc_lint::{LateContext, LateLintPass};
Expand Down Expand Up @@ -69,12 +67,8 @@ fn missing_warning(cx: &LateContext<'_>, package: &cargo_metadata::Package, fiel
span_lint(cx, CARGO_COMMON_METADATA, DUMMY_SP, &message);
}

fn is_empty_str(value: &Option<String>) -> bool {
value.as_ref().map_or(true, String::is_empty)
}

fn is_empty_path(value: &Option<PathBuf>) -> bool {
value.as_ref().and_then(|x| x.to_str()).map_or(true, str::is_empty)
fn is_empty_str<T: AsRef<std::ffi::OsStr>>(value: &Option<T>) -> bool {
value.as_ref().map_or(true, |s| s.as_ref().is_empty())
}

fn is_empty_vec(value: &[String]) -> bool {
Expand All @@ -98,15 +92,15 @@ impl LateLintPass<'_> for CargoCommonMetadata {
missing_warning(cx, &package, "package.description");
}

if is_empty_str(&package.license) && is_empty_path(&package.license_file) {
if is_empty_str(&package.license) && is_empty_str(&package.license_file) {
missing_warning(cx, &package, "either package.license or package.license_file");
}

if is_empty_str(&package.repository) {
missing_warning(cx, &package, "package.repository");
}

if is_empty_path(&package.readme) {
if is_empty_str(&package.readme) {
missing_warning(cx, &package, "package.readme");
}

Expand Down
4 changes: 2 additions & 2 deletions src/tools/clippy/clippy_utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2018"
publish = false

[dependencies]
if_chain = "1.0.0"
rustc-semver="1.1.0"
if_chain = "1.0"
rustc-semver = "1.1"

[features]
deny-warnings = []
Expand Down
18 changes: 9 additions & 9 deletions src/tools/clippy/lintcheck/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ publish = false

[dependencies]
clap = "2.33"
flate2 = {version = "1.0.19"}
fs_extra = {version = "1.2.0"}
rayon = {version = "1.5.0"}
serde = {version = "1.0", features = ["derive"]}
serde_json = {version = "1.0"}
tar = {version = "0.4.30"}
toml = {version = "0.5"}
ureq = {version = "2.0.0-rc3"}
walkdir = {version = "2.3.2"}
flate2 = "1.0"
fs_extra = "1.2"
rayon = "1.5"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tar = "0.4"
toml = "0.5"
ureq = "2.2"
walkdir = "2.3"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This removes clap and adds walkdir?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removal of clap was me fat-fingering the patch by hand.

walkdir was added here: rust-lang/rust-clippy@997ddbb

This version of clippy does yet not seem to include that commit.

Both problems were fixed with my most recent push.


[features]
deny-warnings = []