about summary refs log tree commit diff
path: root/tvix/eval/src/tests
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-12-20T14·22+0300
committerclbot <clbot@tvl.fyi>2022-12-25T18·25+0000
commit71174f6626cbf100a8428ddc334681e4edfb45e6 (patch)
tree1e803137d755001700f0e900aa5173bbf43fdf3f /tvix/eval/src/tests
parent67d508f2ece710714ce8abf6f7deba1fd2440487 (diff)
fix(tvix/eval): fix current clippy warnings r/5486
It's been a while since the last time, so quite a lot of stuff has
accumulated here.

Change-Id: I0762827c197b30a917ff470fd8ae8f220f6ba247
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7597
Reviewed-by: grfn <grfn@gws.fyi>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/tests')
-rw-r--r--tvix/eval/src/tests/mod.rs14
-rw-r--r--tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-readDir.nix.disabled (renamed from tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-readDir.nix)0
2 files changed, 6 insertions, 8 deletions
diff --git a/tvix/eval/src/tests/mod.rs b/tvix/eval/src/tests/mod.rs
index 1c872f67d2b0..bb46cf2b79b0 100644
--- a/tvix/eval/src/tests/mod.rs
+++ b/tvix/eval/src/tests/mod.rs
@@ -49,15 +49,13 @@ fn eval_test(code_path: &str, expect_success: bool) {
                 "{code_path}: test passed unexpectedly!  consider moving it out of notyetpassing"
             );
         }
+    } else if expect_success {
+        panic!("{code_path}: should be able to read test expectation");
     } else {
-        if expect_success {
-            panic!("{code_path}: should be able to read test expectation");
-        } else {
-            panic!(
-                "{code_path}: test should have failed, but succeeded with output {}",
-                result_str
-            );
-        }
+        panic!(
+            "{code_path}: test should have failed, but succeeded with output {}",
+            result_str
+        );
     }
 }
 
diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-readDir.nix b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-readDir.nix.disabled
index a7ec9292aae2..a7ec9292aae2 100644
--- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-readDir.nix
+++ b/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-readDir.nix.disabled