From 1ebda9e13e0a11d3040267134e0a23600f9faf65 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 6 Jan 2023 18:56:38 +0300 Subject: fix(tvix/derivation): fix build after StorePath rename This project was not previously covered by CI (fixed in this commit), so we didn't catch breakage due to a renamed module. This was noticed while rebasing a CL that has a dependency on this crate in its Nix build. Change-Id: Ic48570b9313e5f73e14daab50cf7ea70918c94d1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7778 Reviewed-by: flokli Autosubmit: tazjin Tested-by: BuildkiteCI --- tvix/derivation/src/tests/mod.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tvix/derivation/src/tests/mod.rs') diff --git a/tvix/derivation/src/tests/mod.rs b/tvix/derivation/src/tests/mod.rs index 8d1771f711..fb88e1beb2 100644 --- a/tvix/derivation/src/tests/mod.rs +++ b/tvix/derivation/src/tests/mod.rs @@ -6,7 +6,7 @@ use std::io::Read; use std::path::Path; use test_case::test_case; use test_generator::test_resources; -use tvix_store::nixpath::StorePath; +use tvix_store::store_path::StorePath; const RESOURCES_PATHS: &str = "src/tests/derivation_tests"; @@ -252,8 +252,7 @@ fn output_path_construction() { let bar_drv_path = bar_drv .calculate_derivation_path("bar") - .expect("must succeed") - .to_absolute_path(); + .expect("must succeed"); // assemble foo env let mut foo_env: BTreeMap = BTreeMap::new(); @@ -275,7 +274,7 @@ fn output_path_construction() { // assemble foo input_derivations let mut foo_input_derivations: BTreeMap> = BTreeMap::new(); - foo_input_derivations.insert(bar_drv_path.to_absolute_string(), vec!["out".to_string()]); + foo_input_derivations.insert(bar_drv_path.to_absolute_path(), vec!["out".to_string()]); // assemble foo itself let mut foo_drv = Derivation { -- cgit 1.4.1