From 1fe0cf6f071979745b4da761edff49478c081f3e Mon Sep 17 00:00:00 2001 From: Sorin Davidoi Date: Fri, 25 Jan 2019 20:27:07 +0100 Subject: [PATCH 1/3] chore(cargo/dependencies/cargo-metadata): Upgrade to 0.7.1 Closes https://github.com/rust-lang/rust-clippy/issues/3692. --- Cargo.toml | 2 +- clippy_lints/Cargo.toml | 2 +- clippy_lints/src/cargo_common_metadata.rs | 2 +- clippy_lints/src/multiple_crate_versions.rs | 2 +- clippy_lints/src/wildcard_dependencies.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ce609bb1adde..868f21c1a498 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ rustc_tools_util = { version = "0.1.1", path = "rustc_tools_util"} [dev-dependencies] clippy_dev = { version = "0.0.1", path = "clippy_dev" } -cargo_metadata = "0.6.2" +cargo_metadata = "0.7.1" compiletest_rs = "0.3.18" lazy_static = "1.0" serde_derive = "1.0" diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml index 6c7f2d25569b..592ad5cde1ce 100644 --- a/clippy_lints/Cargo.toml +++ b/clippy_lints/Cargo.toml @@ -17,7 +17,7 @@ keywords = ["clippy", "lint", "plugin"] edition = "2018" [dependencies] -cargo_metadata = "0.6.2" +cargo_metadata = "0.7.1" itertools = "0.8" lazy_static = "1.0.2" matches = "0.1.7" diff --git a/clippy_lints/src/cargo_common_metadata.rs b/clippy_lints/src/cargo_common_metadata.rs index 70ea387515a8..c60d10cd0092 100644 --- a/clippy_lints/src/cargo_common_metadata.rs +++ b/clippy_lints/src/cargo_common_metadata.rs @@ -66,7 +66,7 @@ impl LintPass for Pass { impl EarlyLintPass for Pass { fn check_crate(&mut self, cx: &EarlyContext<'_>, _: &Crate) { - let metadata = if let Ok(metadata) = cargo_metadata::metadata_deps(None, true) { + let metadata = if let Ok(metadata) = cargo_metadata::MetadataCommand::new().no_deps().exec() { metadata } else { warning(cx, "could not read cargo metadata"); diff --git a/clippy_lints/src/multiple_crate_versions.rs b/clippy_lints/src/multiple_crate_versions.rs index 073d3857c55b..6a042fa8c0a0 100644 --- a/clippy_lints/src/multiple_crate_versions.rs +++ b/clippy_lints/src/multiple_crate_versions.rs @@ -41,7 +41,7 @@ impl LintPass for Pass { impl EarlyLintPass for Pass { fn check_crate(&mut self, cx: &EarlyContext<'_>, _: &Crate) { - let metadata = if let Ok(metadata) = cargo_metadata::metadata_deps(None, true) { + let metadata = if let Ok(metadata) = cargo_metadata::MetadataCommand::new().exec() { metadata } else { span_lint(cx, MULTIPLE_CRATE_VERSIONS, DUMMY_SP, "could not read cargo metadata"); diff --git a/clippy_lints/src/wildcard_dependencies.rs b/clippy_lints/src/wildcard_dependencies.rs index e3c352862518..fb88b1371f7e 100644 --- a/clippy_lints/src/wildcard_dependencies.rs +++ b/clippy_lints/src/wildcard_dependencies.rs @@ -37,7 +37,7 @@ impl LintPass for Pass { impl EarlyLintPass for Pass { fn check_crate(&mut self, cx: &EarlyContext<'_>, _: &Crate) { - let metadata = if let Ok(metadata) = cargo_metadata::metadata(None) { + let metadata = if let Ok(metadata) = cargo_metadata::MetadataCommand::new().no_deps().exec() { metadata } else { span_lint(cx, WILDCARD_DEPENDENCIES, DUMMY_SP, "could not read cargo metadata"); From 53ce28a96930bd6b2c3add3d4fc54bacab6c42e7 Mon Sep 17 00:00:00 2001 From: Sorin Davidoi Date: Fri, 25 Jan 2019 20:39:45 +0100 Subject: [PATCH 2/3] test(versioncheck): Fix version equality check --- tests/versioncheck.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/versioncheck.rs b/tests/versioncheck.rs index 9e00571c9d5d..fe4017ceb354 100644 --- a/tests/versioncheck.rs +++ b/tests/versioncheck.rs @@ -1,17 +1,16 @@ -use semver::VersionReq; - #[test] fn check_that_clippy_lints_has_the_same_version_as_clippy() { - let clippy_meta = cargo_metadata::metadata(None).expect("could not obtain cargo metadata"); + let clippy_meta = cargo_metadata::MetadataCommand::new() + .exec() + .expect("could not obtain cargo metadata"); std::env::set_current_dir(std::env::current_dir().unwrap().join("clippy_lints")).unwrap(); - let clippy_lints_meta = cargo_metadata::metadata(None).expect("could not obtain cargo metadata"); + let clippy_lints_meta = cargo_metadata::MetadataCommand::new() + .exec() + .expect("could not obtain cargo metadata"); assert_eq!(clippy_lints_meta.packages[0].version, clippy_meta.packages[0].version); for package in &clippy_meta.packages[0].dependencies { if package.name == "clippy_lints" { - assert_eq!( - VersionReq::parse(&clippy_lints_meta.packages[0].version).unwrap(), - package.req - ); + assert!(package.req.matches(&clippy_lints_meta.packages[0].version)); return; } } From dc3bee796219534de7b4719d76c73672041ed786 Mon Sep 17 00:00:00 2001 From: Sorin Davidoi Date: Fri, 25 Jan 2019 21:28:09 +0100 Subject: [PATCH 3/3] test(versioncheck): Use .no_deps() --- tests/versioncheck.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/versioncheck.rs b/tests/versioncheck.rs index fe4017ceb354..f5d03c645df0 100644 --- a/tests/versioncheck.rs +++ b/tests/versioncheck.rs @@ -1,10 +1,12 @@ #[test] fn check_that_clippy_lints_has_the_same_version_as_clippy() { let clippy_meta = cargo_metadata::MetadataCommand::new() + .no_deps() .exec() .expect("could not obtain cargo metadata"); std::env::set_current_dir(std::env::current_dir().unwrap().join("clippy_lints")).unwrap(); let clippy_lints_meta = cargo_metadata::MetadataCommand::new() + .no_deps() .exec() .expect("could not obtain cargo metadata"); assert_eq!(clippy_lints_meta.packages[0].version, clippy_meta.packages[0].version);