about summary refs log tree commit diff
path: root/tvix/derivation/src/validate.rs
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2023-01-13T17·19+0300
committertazjin <tazjin@tvl.su>2023-01-13T18·01+0000
commita35dadf9f0c7c98d2ae8761428936a0b9d30489e (patch)
treebf05125f09832e0e701f75a0bab401b486b10548 /tvix/derivation/src/validate.rs
parent9a500c3e9bb502a08670fbecf593c98eb6d62358 (diff)
refactor(tvix/derivation): use BTreeSet for derivation outputs r/5657
When constructing derivations inside builtins.derivationStrict, we'd
have to very frequently check whether certain outputs have already
been inserted into the derivation inputs.

Using a set type is much easier, especially as this has to be ordered
and the source data that is being inserted also comes from a set,
which might let us pass this more efficiently in the future.

Note that the validate function no longer checks the order of the
entries, as that is now guaranteed by the type.

Change-Id: I2fbb984facba3e668075f6f8df8992092368c63d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7826
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/derivation/src/validate.rs')
-rw-r--r--tvix/derivation/src/validate.rs10
1 files changed, 1 insertions, 9 deletions
diff --git a/tvix/derivation/src/validate.rs b/tvix/derivation/src/validate.rs
index eda0457ae5..5335f43636 100644
--- a/tvix/derivation/src/validate.rs
+++ b/tvix/derivation/src/validate.rs
@@ -50,21 +50,13 @@ impl Derivation {
                 );
             }
 
-            for (i, output_name) in output_names.iter().enumerate() {
+            for output_name in output_names.iter() {
                 if output_name.is_empty() {
                     bail!(
                         "output name entry for {} may not be empty",
                         input_derivation_path
                     )
                 }
-                // if i is at least 1, peek at the previous element to ensure output_names are sorted.
-                if i > 0 && (output_names[i - 1] >= *output_name) {
-                    bail!(
-                        "invalid input derivation output order: {} < {}",
-                        output_name,
-                        output_names[i - 1],
-                    );
-                }
             }
         }