danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

match -> map_err

Browse source
This commit is contained in:
Cole Helbling 2020-04-03 10:51:02 -07:00
parent 2b2b675011
commit 9dc0fd123a
No known key found for this signature in database
GPG key ID: B37E0F2371016A4C
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ofborg/src/nixenv.rs
View file

@ -61,29 +61,18 @@ impl HydraNixEnv {
/// emulates Hydra's behavior.
fn place_nix(&self) -> Result<(), Error> {
let outpath = self.outpath_nix_path();
let mut file = File::create(&outpath).map_err(|e| Error::CreateFile(outpath, e))?;
let mut file = match File::create(&outpath) {
Ok(f) => f,
Err(e) => return Err(Error::CreateFile(outpath, e)),
};
match file.write_all(include_bytes!("outpaths.nix")) {
Ok(_) => Ok(()),
Err(e) => Err(Error::WriteFile(file, e)),
}
file.write_all(include_bytes!("outpaths.nix"))
.map_err(|e| Error::WriteFile(file, e))
}
fn remove_nix(&self) -> Result<(), Error> {
let outpath_nix = self.outpath_nix_path();
let outpath_stats = self.outpath_stats_path();
if let Err(e) = fs::remove_file(&outpath_nix) {
return Err(Error::RemoveFile(outpath_nix, e));
}
if let Err(e) = fs::remove_file(&outpath_stats) {
return Err(Error::RemoveFile(outpath_stats, e));
}
fs::remove_file(&outpath_nix).map_err(|e| Error::RemoveFile(outpath_nix, e))?;
fs::remove_file(&outpath_stats).map_err(|e| Error::RemoveFile(outpath_stats, e))?;
Ok(())
}