s0me1newithhand7s/system-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use anyhow::bail!

Browse source
This commit is contained in:
R-VdP 2023-02-17 11:51:12 +01:00
parent 1cce38559c
commit 71c2e5bf21
No known key found for this signature in database
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/generate.rs
View file

@ -1,4 +1,4 @@
use anyhow::{anyhow, Context, Result}; use anyhow::{Context, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::HashMap; use std::collections::HashMap;
use std::fs::DirBuilder; use std::fs::DirBuilder;
@ -71,7 +71,7 @@ fn get_store_path(nix_build_result: process::Output) -> Result<StorePath> {
.map_err(anyhow::Error::from) .map_err(anyhow::Error::from)
.and_then(|e| { .and_then(|e| {
log::error!("{}", e); log::error!("{}", e);
Err(anyhow!("Nix build failed.")) anyhow::bail!("Nix build failed.")
}) })
} }
} }
@ -85,14 +85,12 @@ fn parse_nix_build_output(output: String) -> Result<StorePath> {
if let Some(store_path) = result.outputs.get(expected_output_name) { if let Some(store_path) = result.outputs.get(expected_output_name) {
return Ok(StorePath::from(store_path.to_owned())); return Ok(StorePath::from(store_path.to_owned()));
} }
return Err(anyhow!( anyhow::bail!(
"No output '{}' found in nix build result.", "No output '{}' found in nix build result.",
expected_output_name expected_output_name
)); )
} }
Err(anyhow!( anyhow::bail!("Multiple build results were returned, we cannot handle that yet.")
"Multiple build results were returned, we cannot handle that yet."
))
} }
fn run_nix_build(flake_uri: &str, flake_attr: &str) -> Result<process::Output> { fn run_nix_build(flake_uri: &str, flake_attr: &str) -> Result<process::Output> {