From 5b1d849c7e1df0b413237d7a0a0a70c2cbfd52e9 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 21 Jun 2016 15:24:04 +0530 Subject: [PATCH] Revert "fix cargo clippy when using with `--manifest-path`" This reverts commit b31bebeea4b7ae1a1312049745649d8d2c89c0f4. --- clippy_lints/src/utils/cargo.rs | 9 ++------- src/main.rs | 3 +-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/clippy_lints/src/utils/cargo.rs b/clippy_lints/src/utils/cargo.rs index 48a97f2f1fc..f81fcbc38ab 100644 --- a/clippy_lints/src/utils/cargo.rs +++ b/clippy_lints/src/utils/cargo.rs @@ -65,13 +65,8 @@ fn from(err: json::DecoderError) -> Self { } } -pub fn metadata(manifest_path: Option) -> Result { - let mut cmd = Command::new("cargo"); - cmd.arg("metadata").arg("--no-deps"); - if let Some(ref mani) = manifest_path { - cmd.arg(mani); - } - let output = cmd.output()?; +pub fn metadata() -> Result { + let output = Command::new("cargo").args(&["metadata", "--no-deps"]).output()?; let stdout = from_utf8(&output.stdout)?; Ok(json::decode(stdout)?) } diff --git a/src/main.rs b/src/main.rs index cf57926440b..de3361d514f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -129,8 +129,7 @@ pub fn main() { }; if let Some("clippy") = std::env::args().nth(1).as_ref().map(AsRef::as_ref) { - let manifest_path = std::env::args().skip(2).find(|val| val.starts_with("--manifest-path=")); - let mut metadata = cargo::metadata(manifest_path).expect("could not obtain cargo metadata"); + let mut metadata = cargo::metadata().expect("could not obtain cargo metadata"); assert_eq!(metadata.version, 1); for target in metadata.packages.remove(0).targets { let args = std::env::args().skip(2); -- 2.44.0