From 992e1fcc87b8f47e7754e9eb1b13dab73f281f00 Mon Sep 17 00:00:00 2001
From: Fisher Darling <fdarlingco@gmail.com>
Date: Thu, 4 Jul 2019 13:05:12 +0000
Subject: [PATCH] Update 2018, fixed breaking changes.

---
 src/main.rs | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index ea077d9..c1d1239 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -87,7 +87,7 @@ fn main() {
     } = Opts::from_args();
 
     let mut metadata_cmd = cargo_metadata::MetadataCommand::new();
-    metadata_cmd.manifest_path(manifest_path);
+    metadata_cmd.manifest_path(manifest_path).no_deps();
 
     let project_metadata = metadata_cmd.exec().unwrap();
 
@@ -97,15 +97,7 @@ fn main() {
             error!("No project found.");
             exit(-2);
         },
-        |project| {
-            (
-                project.manifest_path
-                    .as_path()
-                    .parent()
-                    .expect("Cargo.toml seems to have no parent directory?"),
-                &project.name,
-            )
-        },
+        |project| (&project_metadata.workspace_root, &project.name),
     );
 
     let configs = vec![
@@ -149,10 +141,7 @@ fn main() {
         .arg("--rsync-path")
         .arg("mkdir -p remote-builds && rsync")
         .arg(format!("{}/", project_dir.to_string_lossy()))
-        .arg(format!(
-            "{}:{}",
-            build_server, build_path
-        ))
+        .arg(format!("{}:{}", build_server, build_path))
         .stdout(Stdio::inherit())
         .stderr(Stdio::inherit())
         .stdin(Stdio::inherit())
@@ -164,8 +153,7 @@ fn main() {
 
     let build_command = format!(
         "cd {}; $HOME/.cargo/bin/cargo {} {}",
-        build_path
-        project_name,
+        build_path,
         command,
         options.join(" ")
     );
@@ -191,10 +179,7 @@ fn main() {
             .arg("--delete")
             .arg("--compress")
             .arg("--info=progress2")
-            .arg(format!(
-                "{}:{}/target/",
-                build_server, build_path
-            ))
+            .arg(format!("{}:{}/target/", build_server, build_path))
             .arg(format!("{}/target/", project_dir.to_string_lossy()))
             .stdout(Stdio::inherit())
             .stderr(Stdio::inherit())