mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(nix/nint): use stdout().write_all() over print!()

Browse source 
Change-Id: Ic372442c5156f1e13fea28c1b3e57d64e89ba49b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3546
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
sterni 2021-09-14 23:47:53 +02:00
parent 391a186d27
commit 529ac7fd12
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nix/nint/nint.rs
View file

@ -3,7 +3,7 @@ extern crate serde_json;
use serde_json::Value;
use std::ffi::OsString;
use std::os::unix::ffi::{OsStringExt, OsStrExt};
use std::io::{Error, ErrorKind, Write};
use std::io::{Error, ErrorKind, Write, stdout, stderr};
use std::process::Command;
fn render_nix_string(s: &OsString) -> OsString {
@ -99,10 +99,10 @@ fn main() -> std::io::Result<()> {
.output()?;
match serde_json::from_slice(&run.stdout[..]) {
Ok(Value::String(s)) => Ok(print!("{}", s)),
Ok(Value::String(s)) => stdout().write_all(s.as_bytes()),
Ok(_) => Err(Error::new(ErrorKind::Other, "output must be a string")),
_ => {
std::io::stderr().write_all(&run.stderr[..]);
stderr().write_all(&run.stderr[..]);
Err(Error::new(ErrorKind::Other, "internal nix error"))
},
}