Fix unix build

Author: wesleywiser

collector/src/execute.rs

@@ -2,7 +2,7 @@
 
 use crate::{BuildKind, Compiler, RunKind};
 use anyhow::{anyhow, bail, Context};
-use collector::{command_output, robocopy};
+use collector::command_output;
 use database::{PatchName, QueryLabel};
 use futures::stream::FuturesUnordered;
 use futures::stream::StreamExt;
@@ -33,7 +33,7 @@ fn rename<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> anyhow::Result<()>
         return Ok(fs::rename(from, to).with_context(|| ctx.clone())?);
     }
 
-    robocopy(from, to, &[&"/move"]).with_context(|| ctx.clone())
+    collector::robocopy(from, to, &[&"/move"]).with_context(|| ctx.clone())
 }
 
 #[cfg(unix)]
@@ -1135,14 +1135,15 @@ impl Benchmark {
 
     #[cfg(windows)]
     fn copy(from: &Path, to: &Path) -> anyhow::Result<()> {
-        robocopy(from, to, &[])
+        collector::robocopy(from, to, &[])
     }
 
     #[cfg(unix)]
     fn copy(from: &Path, to: &Path) -> anyhow::Result<()> {
         let mut cmd = Command::new("cp");
         cmd.arg("-pLR").arg(from).arg(to);
-        command_output(&mut cmd)
+        command_output(&mut cmd)?;
+        Ok(())
     }
 
     fn make_temp_dir(&self, base: &Path) -> anyhow::Result<TempDir> {

collector/src/lib.rs

@@ -1,7 +1,7 @@
 use chrono::NaiveDate;
 pub use database::{Commit, PatchName, QueryLabel};
 use serde::Deserialize;
-use std::{cmp::PartialOrd, ffi::OsStr, path::Path};
+use std::cmp::PartialOrd;
 use std::fmt;
 use std::process::{self, Command};
 
@@ -145,7 +145,11 @@ pub fn run_command(cmd: &mut Command) -> anyhow::Result<()> {
 }
 
 #[cfg(windows)]
-pub fn robocopy(from: &Path, to: &Path, extra_args: &[&dyn AsRef<OsStr>]) -> anyhow::Result<()> {
+pub fn robocopy(
+    from: &std::path::Path,
+    to: &std::path::Path,
+    extra_args: &[&dyn AsRef<std::ffi::OsStr>]
+) -> anyhow::Result<()> {
     let mut cmd = Command::new("robocopy");
     cmd.arg(from).arg(to).arg("/s").arg("/e");