From fc117b0900cfcba6f5f87882e15c7d263171f6c3 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 28 Oct 2021 23:14:43 +0200 Subject: runner: drop paths::abs() function --- crates/runner/src/paths.rs | 4 ---- crates/runner/src/task.rs | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/crates/runner/src/paths.rs b/crates/runner/src/paths.rs index 15e1f14..660021c 100644 --- a/crates/runner/src/paths.rs +++ b/crates/runner/src/paths.rs @@ -68,10 +68,6 @@ pub fn join(paths: &[&str]) -> String { paths.join("/") } -pub fn abs(path: &str) -> String { - join(&["", path]) -} - pub fn task_tmp_dir(hash: &InputHash) -> String { join(&[TASK_TMP_DIR, &hash.to_string()]) } diff --git a/crates/runner/src/task.rs b/crates/runner/src/task.rs index f203c2c..a909d22 100644 --- a/crates/runner/src/task.rs +++ b/crates/runner/src/task.rs @@ -301,10 +301,7 @@ fn run_task(input_hash: &InputHash, task: &Task, jobserver: &mut Jobserver) -> R .context("Failed to unset O_CLOEXEC on jobserver pipe")?; let err = Command::new("sh") - .args(&[ - "-ex", - &paths::abs(&paths::join(&[paths::TASK_TASKDIR, paths::TASK_RUN])), - ]) + .args(&["-ex", &paths::join(&[paths::TASK_TASKDIR, paths::TASK_RUN])]) .stdin(Stdio::null()) .stdout(log_stdout) .stderr(log_stderr) -- cgit v1.2.3