maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/nix-compat): remove manual map

Browse source 
Change-Id: I1652e24c9be28112d98683de2d2db51dc46001ed
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8302
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-03-14 19:32:26 +01:00 • committed by flokli
parent c699ace11b
commit 84a8ed265c
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tvix/nix-compat/src/derivation/mod.rs
View file

@ -85,15 +85,13 @@ impl Derivation {
return None;
}
match self.outputs.get("out") {
#[allow(clippy::manual_map)]
Some(out_output) => match &out_output.hash {
Some(out_output_hash) => Some((&out_output.path, out_output_hash)),
// There has to be a hash, otherwise it would not be FOD
None => None,
},
None => None,
if let Some(out_output) = self.outputs.get("out") {
if let Some(out_output_hash) = &out_output.hash {
return Some((&out_output.path, out_output_hash));
}
// There has to be a hash, otherwise it would not be FOD
}
return None;
}
/// Returns the drv path of a Derivation struct.