From b31bebeea4b7ae1a1312049745649d8d2c89c0f4 Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
Date: Tue, 21 Jun 2016 11:35:34 +0200
Subject: [PATCH] fix cargo clippy when using with `--manifest-path`

---
 clippy_lints/src/utils/cargo.rs | 9 +++++++--
 src/main.rs                     | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/clippy_lints/src/utils/cargo.rs b/clippy_lints/src/utils/cargo.rs
index f81fcbc38ab..48a97f2f1fc 100644
--- a/clippy_lints/src/utils/cargo.rs
+++ b/clippy_lints/src/utils/cargo.rs
@@ -65,8 +65,13 @@ impl From<json::DecoderError> for Error {
     }
 }
 
-pub fn metadata() -> Result<Metadata, Error> {
-    let output = Command::new("cargo").args(&["metadata", "--no-deps"]).output()?;
+pub fn metadata(manifest_path: Option<String>) -> Result<Metadata, Error> {
+    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()?;
     let stdout = from_utf8(&output.stdout)?;
     Ok(json::decode(stdout)?)
 }
diff --git a/src/main.rs b/src/main.rs
index de3361d514f..cf57926440b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -129,7 +129,8 @@ pub fn main() {
     };
 
     if let Some("clippy") = std::env::args().nth(1).as_ref().map(AsRef::as_ref) {
-        let mut metadata = cargo::metadata().expect("could not obtain cargo metadata");
+        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");
         assert_eq!(metadata.version, 1);
         for target in metadata.packages.remove(0).targets {
             let args = std::env::args().skip(2);