refactor: split eval loading helpers

Separate fixture diff resolution from repo-path resolution so execution setup can change each concern independently.

Made-with: Cursor

Author: haasonsaas

TODO.md

@@ -71,7 +71,7 @@
 - [x] `src/commands/doctor/command/display.rs`: separate header/config output, endpoint listing, and inference result rendering.
 - [x] `src/commands/doctor/command/run.rs`: separate endpoint discovery, recommendation flow, and test helpers.
 - [x] `src/commands/eval/runner/matching.rs`: split required-match search, unexpected-match detection, and rule metric assembly.
-- [ ] `src/commands/eval/runner/execute/loading.rs`: separate diff resolution from repo-path resolution if it grows again.
+- [x] `src/commands/eval/runner/execute/loading.rs`: separate diff resolution from repo-path resolution if it grows again.
 - [ ] `src/commands/feedback_eval/report/examples.rs`: split ranking helpers from example builders.
 - [ ] `src/commands/doctor/system.rs`: carve environment probes vs output helpers.
 

src/commands/eval/runner/execute/loading.rs

@@ -1,9 +1,16 @@
+#[path = "loading/diff.rs"]
+mod diff;
+#[path = "loading/repo.rs"]
+mod repo;
+
 use anyhow::Result;
 use std::path::{Path, PathBuf};
 
 use crate::core::eval_benchmarks::{BenchmarkThresholds, Difficulty};
 
 use super::super::super::{EvalFixture, LoadedEvalFixture};
+use diff::load_diff_content;
+use repo::resolve_repo_path;
 
 pub(super) struct PreparedFixtureExecution {
     pub(super) fixture_name: String,
@@ -49,39 +56,3 @@ pub(super) fn prepare_fixture_execution(
         repo_path,
     })
 }
-
-fn load_diff_content(
-    fixture_name: &str,
-    fixture_dir: &Path,
-    fixture: &EvalFixture,
-) -> Result<String> {
-    match (fixture.diff.clone(), fixture.diff_file.clone()) {
-        (Some(diff), _) => Ok(diff),
-        (None, Some(diff_file)) => {
-            let path = if diff_file.is_absolute() {
-                diff_file
-            } else {
-                fixture_dir.join(diff_file)
-            };
-            Ok(std::fs::read_to_string(path)?)
-        }
-        (None, None) => anyhow::bail!(
-            "Fixture '{}' must define either diff or diff_file",
-            fixture_name
-        ),
-    }
-}
-
-fn resolve_repo_path(fixture_dir: &Path, fixture: &EvalFixture) -> PathBuf {
-    fixture
-        .repo_path
-        .clone()
-        .map(|path| {
-            if path.is_absolute() {
-                path
-            } else {
-                fixture_dir.join(path)
-            }
-        })
-        .unwrap_or_else(|| PathBuf::from("."))
-}

src/commands/eval/runner/execute/loading/diff.rs

@@ -0,0 +1,26 @@
+use anyhow::Result;
+use std::path::Path;
+
+use super::super::super::super::EvalFixture;
+
+pub(super) fn load_diff_content(
+    fixture_name: &str,
+    fixture_dir: &Path,
+    fixture: &EvalFixture,
+) -> Result<String> {
+    match (fixture.diff.clone(), fixture.diff_file.clone()) {
+        (Some(diff), _) => Ok(diff),
+        (None, Some(diff_file)) => {
+            let path = if diff_file.is_absolute() {
+                diff_file
+            } else {
+                fixture_dir.join(diff_file)
+            };
+            Ok(std::fs::read_to_string(path)?)
+        }
+        (None, None) => anyhow::bail!(
+            "Fixture '{}' must define either diff or diff_file",
+            fixture_name
+        ),
+    }
+}

src/commands/eval/runner/execute/loading/repo.rs

@@ -0,0 +1,17 @@
+use std::path::{Path, PathBuf};
+
+use super::super::super::super::EvalFixture;
+
+pub(super) fn resolve_repo_path(fixture_dir: &Path, fixture: &EvalFixture) -> PathBuf {
+    fixture
+        .repo_path
+        .clone()
+        .map(|path| {
+            if path.is_absolute() {
+                path
+            } else {
+                fixture_dir.join(path)
+            }
+        })
+        .unwrap_or_else(|| PathBuf::from("."))
+}