diff options
| author | Peter Kolloch <info@eigenvalue.net> | 2024-02-21T11·31+0700 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-02-21T11·38+0000 |
| commit | fde488ec6dc444561ae353f979d87c8ae87261fb (patch) | |
| tree | c9b673d9d0fc19709f61c88ceb59092f11d7facd /tvix/glue/src/tvix_store_io.rs | |
| parent | 035f617b7f11f2ec4a9e08e3a31a175e71a6544b (diff) | |
feat(tvix/nix-compat): Use `StorePath` in `Output` r/7585
https: //b.tvl.fyi/issues/264 Change-Id: Icb09be9643245cc68d09f01d7723af2d44d6bd1a Reviewed-on: https://cl.tvl.fyi/c/depot/+/11001 Autosubmit: Peter Kolloch <info@eigenvalue.net> Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/glue/src/tvix_store_io.rs')
| -rw-r--r-- | tvix/glue/src/tvix_store_io.rs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs index 296a369e29c1..333b04b170c7 100644 --- a/tvix/glue/src/tvix_store_io.rs +++ b/tvix/glue/src/tvix_store_io.rs @@ -4,10 +4,7 @@ use async_recursion::async_recursion; use bytes::Bytes; use futures::Stream; use futures::{StreamExt, TryStreamExt}; -use nix_compat::{ - nixhash::CAHash, - store_path::{StorePath, StorePathRef}, -}; +use nix_compat::{nixhash::CAHash, store_path::StorePath}; use std::{ cell::RefCell, collections::BTreeSet, @@ -153,16 +150,14 @@ impl TvixStoreIO { let output_paths: Vec<StorePath> = output_names .iter() .map(|output_name| { - let output_path = &input_drv + input_drv .outputs .get(output_name) .expect("missing output_name") - .path; - - // since Derivation is validated, we this can be parsed. - StorePathRef::from_absolute_path(output_path.as_bytes()) - .expect("invalid output path") - .to_owned() + .path + .as_ref() + .expect("missing output path") + .clone() }) .collect(); // For each output, ask for the castore node. |