diff options
| author | Florian Klink <flokli@flokli.de> | 2023-12-09T10·48+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-12-09T12·58+0000 |
| commit | 0907420600ba0f9270065dd83e81fb8f56dfda71 (patch) | |
| tree | 4bacffb7e7b9b1352f9def180f4a990f395610ac /tvix/nix-compat/src/derivation/validate.rs | |
| parent | 5855959d879a6f57ff683f752fdc4d0c47427382 (diff) | |
refactor(nix-compat/store_path): from_absolute_path to StorePathRef r/7132
The only non-test usage was only checking for the error case, and we can still convert this to an owned StorePath by calling to_owned() on StorePathRef. Change-Id: I9f67a759e580c9c429c96896bcdd295392aa5a2a Reviewed-on: https://cl.tvl.fyi/c/depot/+/10225 Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/nix-compat/src/derivation/validate.rs')
| -rw-r--r-- | tvix/nix-compat/src/derivation/validate.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/nix-compat/src/derivation/validate.rs b/tvix/nix-compat/src/derivation/validate.rs index 37ddf9017138..b88df1f621cd 100644 --- a/tvix/nix-compat/src/derivation/validate.rs +++ b/tvix/nix-compat/src/derivation/validate.rs @@ -1,5 +1,5 @@ use crate::derivation::{Derivation, DerivationError}; -use crate::store_path::{self, StorePath}; +use crate::store_path::{self, StorePathRef}; impl Derivation { /// validate ensures a Derivation struct is properly populated, @@ -53,7 +53,7 @@ impl Derivation { // Validate all input_derivations for (input_derivation_path, output_names) in &self.input_derivations { // Validate input_derivation_path - if let Err(e) = StorePath::from_absolute_path(input_derivation_path.as_bytes()) { + if let Err(e) = StorePathRef::from_absolute_path(input_derivation_path.as_bytes()) { return Err(DerivationError::InvalidInputDerivationPath( input_derivation_path.to_string(), e, @@ -96,7 +96,7 @@ impl Derivation { // Validate all input_sources for input_source in self.input_sources.iter() { - if let Err(e) = StorePath::from_absolute_path(input_source.as_bytes()) { + if let Err(e) = StorePathRef::from_absolute_path(input_source.as_bytes()) { return Err(DerivationError::InvalidInputSourcesPath( input_source.to_string(), e, |