From 2e66f7da9241a4245969321281a38f325891eefc Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 26 Jan 2023 13:17:59 +0300 Subject: fix(tvix/cli): correctly trim cppnix output in NixCompatIO We only stripped one of the two uses of this string, leading to extraneous newlines in the refscanner. Change-Id: I25d9119be082c487352f0cf66b97ecdcc3e1de06 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7932 Reviewed-by: flokli Tested-by: BuildkiteCI --- tvix/cli/src/nix_compat.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tvix/cli/src/nix_compat.rs b/tvix/cli/src/nix_compat.rs index c3b28c53f6c8..b20953f2b002 100644 --- a/tvix/cli/src/nix_compat.rs +++ b/tvix/cli/src/nix_compat.rs @@ -78,17 +78,18 @@ impl NixCompatIO { if !out.status.success() { return Err(io::Error::new( io::ErrorKind::Other, - String::from_utf8_lossy(&out.stderr), + String::from_utf8_lossy(&out.stderr).trim().to_owned(), )); } let out_path_str = String::from_utf8(out.stdout) .map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))?; + let out_path_trimmed = out_path_str.trim(); - self.known_paths.borrow_mut().plain(&out_path_str); + self.known_paths.borrow_mut().plain(out_path_trimmed); let mut out_path = PathBuf::new(); - out_path.push(out_path_str.trim()); + out_path.push(out_path_trimmed); Ok(out_path) } } -- cgit 1.4.1