From 69a252c1b3492ea2902447a3331933c3fbe4d7f6 Mon Sep 17 00:00:00 2001
From: Bastien Orivel <eijebong@bananium.fr>
Date: Sat, 27 Apr 2019 23:31:48 +0200
Subject: [PATCH] Update cargo_metadata to 0.7

---
 Cargo.toml            | 2 +-
 src/bin/cargo-miri.rs | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ce9c3cc4f29..639fd50c750 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ required-features = ["rustc_tests"]
 
 [dependencies]
 byteorder = { version = "1.1", features = ["i128"]}
-cargo_metadata = { version = "0.6", optional = true }
+cargo_metadata = { version = "0.7", optional = true }
 directories = { version = "1.0", optional = true }
 rustc_version = { version = "0.2.3", optional = true }
 env_logger = "0.6"
diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
index b24bf65629b..5fc6f4af2b2 100644
--- a/src/bin/cargo-miri.rs
+++ b/src/bin/cargo-miri.rs
@@ -83,10 +83,11 @@ fn list_targets() -> impl Iterator<Item=cargo_metadata::Target> {
         Path::new(&m).canonicalize().unwrap()
     );
 
-    let mut metadata = if let Ok(metadata) = cargo_metadata::metadata(
-        manifest_path.as_ref().map(AsRef::as_ref),
-    )
-    {
+    let mut cmd = cargo_metadata::MetadataCommand::new();
+    if let Some(ref manifest_path) = manifest_path {
+        cmd.manifest_path(manifest_path);
+    }
+    let mut metadata = if let Ok(metadata) = cmd.exec() {
         metadata
     } else {
         show_error(format!("Could not obtain Cargo metadata"));