fix(eval): fix failing tests

.github/workflows/rust.yml

@@ -0,0 +1,23 @@
+name: Rust
+
+on:
+  merge_group:
+    branches: [ "canon" ]
+  pull_request:
+    branches: [ "canon" ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v6
+    - name: Install cargo-binstall
+      uses: cargo-bins/cargo-binstall@e7cc28468cf17df7cb288daea80c0c5437af360b
+    - name: install cargo-nextest
+      run: cargo binstall cargo-nextest
+    - name: Run tests
+      run: cargo nextest run --no-fail-fast

.zed/settings.json

@@ -0,0 +1,11 @@
+{
+  "lsp": {
+    "rust-analyzer": {
+      "initialization_options": {
+        "check": {
+          "command": "clippy",
+        },
+      },
+    },
+  },
+}

Cargo.toml

@@ -24,3 +24,4 @@ criterion = "0.8.2"
 expect-test = "1.5.1"
 proptest = "1.11.0"
 quick-xml = "0.39.2"
+toml = "1.1.2"

flake.nix

@@ -1,6 +1,4 @@
 {
-  description = "Theos — Windows NT-compatible kernel in Rust";
-
   inputs = {
     nixpkgs.url = "github:tinted-software/nixpkgs";
   };
@@ -47,6 +45,7 @@
               cargo
               clippy
               rustfmt
+              rust-analyzer
               cargo-nextest
             ];
             shellHook = ''

rix-cli/src/main.rs

@@ -1,7 +1,6 @@
 use clap::Parser;
 use nix_eval::Evaluator;
 use rootcause::{Report, report};
-use serde_json;
 use std::fs;
 use std::io::{self, Read};
 

rix-eval/Cargo.toml

@@ -23,6 +23,7 @@ codespan.workspace = true
 codespan-reporting.workspace = true
 regex.workspace = true
 quick-xml.workspace = true
+toml.workspace = true
 rix-parser.workspace = true
 
 [dev-dependencies]

rix-eval/benches/evaluation.rs

@@ -70,7 +70,6 @@ fn bench_evaluate_complex_expression(c: &mut Criterion) {
 
 fn bench_variable_resolution(c: &mut Criterion) {
     use nix_eval::VariableScope;
-    use std::collections::HashMap;
 
     let mut evaluator = Evaluator::new();
     let mut scope = VariableScope::new();

rix-eval/build.rs

@@ -159,32 +159,52 @@ fn find_files(dir: &Path, prefix: &str, suffix: &str) -> Vec<PathBuf> {
             let path = entry.path();
             if path.is_dir() {
                 files.extend(find_files(&path, prefix, suffix));
-            } else if path.is_file() {
-                if let Some(file_name) = path.file_name().and_then(|n| n.to_str()) {
-                    if file_name.starts_with(prefix) && file_name.ends_with(suffix) {
-                        files.push(path);
-                    }
-                }
+            } else if path.is_file()
+                && let Some(file_name) = path.file_name().and_then(|n| n.to_str())
+                && file_name.starts_with(prefix)
+                && file_name.ends_with(suffix)
+            {
+                files.push(path);
             }
         }
     }
 
     files
 }
 
+/// Convert a CamelCase or PascalCase string to snake_case
+fn to_snake_case(s: &str) -> String {
+    let mut result = String::with_capacity(s.len() + 4);
+    let mut chars = s.chars().peekable();
+    while let Some(c) = chars.next() {
+        if c.is_uppercase() {
+            if !result.is_empty() && !result.ends_with('_') {
+                // Check if previous char was lowercase (transition) or
+                // next char is lowercase (acronym followed by word)
+                let prev_was_lower = result.chars().last().is_some_and(|pc| pc.is_lowercase());
+                let next_is_lower = chars.peek().is_some_and(|nc| nc.is_lowercase());
+                if prev_was_lower || next_is_lower {
+                    result.push('_');
+                }
+            }
+            result.push(c.to_lowercase().next().unwrap_or(c));
+        } else {
+            result.push(c);
+        }
+    }
+    result
+}
+
 fn path_to_test_name(path: &Path, prefix: &str) -> String {
     // Get relative path from tests/tvix-tests
     let test_dir = PathBuf::from("tests/tvix-tests");
     let relative = path.strip_prefix(&test_dir).unwrap_or(path);
 
-    // Convert to a valid Rust identifier
-    let name = relative
+    // Convert to a valid Rust identifier, with snake_case conversion
+    let raw = relative
         .to_string_lossy()
-        .replace('/', "_")
-        .replace('-', "_")
-        .replace('.', "_")
-        .replace(' ', "_")
-        .replace('\\', "_");
+        .replace(['/', '-', '.', ' ', '\\'], "_");
+    let name = to_snake_case(&raw);
 
     format!("{}_{}", prefix, name)
 }