the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

Replace unwraps with expects

Browse source
This commit is contained in:
Graham Christensen 2017-11-17 19:31:46 -05:00
parent b1b81dd457
commit 27868332b2
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
1 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ofborg/src/nix.rs
View file

@ -30,9 +30,9 @@ impl Nix {
attrargs.push(attr); attrargs.push(attr);
} }
let stdout = tempfile().unwrap(); let stdout = tempfile().expect("Fetching a stdout tempfile");
let stderr = stdout.try_clone().unwrap(); let stderr = stdout.try_clone().expect("Cloning stdout for stderr");
let mut reader = stderr.try_clone().unwrap(); let mut reader = stderr.try_clone().expect("Cloning stderr to the reader");
let status = Command::new("nix-build") let status = Command::new("nix-build")
.env_clear() .env_clear()
@ -47,9 +47,9 @@ impl Nix {
.arg("--keep-going") .arg("--keep-going")
.args(attrargs) .args(attrargs)
.status() .status()
.unwrap(); .expect("Running nix-build");
reader.seek(SeekFrom::Start(0)).unwrap(); reader.seek(SeekFrom::Start(0)).expect("Seeking to Start(0)");
if status.success() { if status.success() {
return Ok(reader) return Ok(reader)
@ -58,17 +58,3 @@ impl Nix {
} }
} }
} }
/*
$attrs = array_intersperse(array_values((array)$body->attrs), '-A');
var_dump($attrs);
$fillers = implode(" ", array_fill(0, count($attrs), '%s'));
$cmd = 'NIX_PATH=nixpkgs=%s nix-build --no-out-link --argstr system %s --option restrict-eval true --keep-going . ' . $fillers;
$args = $attrs;
array_unshift($args, NIX_SYSTEM);
array_unshift($args, $pname);
*/