From 5855959d879a6f57ff683f752fdc4d0c47427382 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 9 Dec 2023 12:02:36 +0200 Subject: [PATCH] refactor(nix-compat/derivation): rename input derivation components Match the naming in parse_input_derivations, call the keys "input_derivation", and the values "output_names". Change-Id: I7d1974819028f8ea543dc3ad78afb803ff9db865 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10224 Reviewed-by: tazjin Autosubmit: flokli Tested-by: BuildkiteCI --- tvix/nix-compat/src/derivation/write.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tvix/nix-compat/src/derivation/write.rs b/tvix/nix-compat/src/derivation/write.rs index 087227c99..0981dfcca 100644 --- a/tvix/nix-compat/src/derivation/write.rs +++ b/tvix/nix-compat/src/derivation/write.rs @@ -105,19 +105,19 @@ pub fn write_input_derivations( ) -> Result<(), io::Error> { write_char(writer, BRACKET_OPEN)?; - for (ii, (input_derivation_path, input_derivation)) in input_derivations.iter().enumerate() { + for (ii, (input_derivation, output_names)) in input_derivations.iter().enumerate() { if ii > 0 { write_char(writer, COMMA)?; } write_char(writer, PAREN_OPEN)?; - write_field(writer, input_derivation_path.as_str(), false)?; + write_field(writer, input_derivation.as_str(), false)?; write_char(writer, COMMA)?; write_char(writer, BRACKET_OPEN)?; write_array_elements( writer, - &input_derivation + &output_names .iter() .map(String::as_bytes) .collect::>(),