Rust 2024 edition

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 version = "1.1.0"
 authors = ["Block <ai-oss-tools@block.xyz>"]
 license = "Apache-2.0"

crates/goose-bench/Cargo.toml

@@ -18,7 +18,7 @@ ctor = "0.2.7"
 goose = { path = "../goose" }
 mcp-core = { path = "../mcp-core" }
 async-trait = "0.1.86"
-chrono = { version = "0.4", features = ["serde"] }
+chrono = { version = "0.4.38", features = ["serde"] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 tracing = "0.1"

crates/goose-bench/src/bench_work_dir.rs

@@ -1,6 +1,6 @@
 use anyhow::Context;
 use chrono::Local;
-use include_dir::{include_dir, Dir};
+use include_dir::{Dir, include_dir};
 use serde::{Deserialize, Serialize};
 use std::fs;
 use std::io;
@@ -141,7 +141,9 @@ impl BenchmarkWorkDir {
             use std::path::Component;
 
             match first {
-                Component::ParentDir => Err(anyhow::anyhow!("RelativePathBaseError: Only paths relative to the current working directory are supported.")),
+                Component::ParentDir => Err(anyhow::anyhow!(
+                    "RelativePathBaseError: Only paths relative to the current working directory are supported."
+                )),
                 // If first component is "."
                 Component::CurDir => Ok(components.collect()),
                 // Otherwise, keep the full path
@@ -168,7 +170,9 @@ impl BenchmarkWorkDir {
         }
 
         if p.is_absolute() {
-            return Err(anyhow::anyhow!("AbsolutePathError: Only paths relative to the current working directory are supported."));
+            return Err(anyhow::anyhow!(
+                "AbsolutePathError: Only paths relative to the current working directory are supported."
+            ));
         }
 
         let asset_rel_path = Self::chop_relative_base(p.clone())

crates/goose-bench/src/error_capture.rs

@@ -5,8 +5,8 @@ use std::sync::Arc;
 use std::sync::RwLock;
 use tokio::sync::Mutex;
 use tracing::{Event, Subscriber};
-use tracing_subscriber::layer::Context;
 use tracing_subscriber::Layer;
+use tracing_subscriber::layer::Context;
 
 // Type alias to reduce complexity
 type ErrorRegistry = RwLock<Option<Arc<Mutex<Vec<BenchAgentError>>>>>;

crates/goose-bench/src/eval_suites/core/computercontroller/script.rs

@@ -3,8 +3,8 @@
 use crate::bench_session::BenchAgent;
 use crate::bench_work_dir::BenchmarkWorkDir;
 use crate::eval_suites::{
-    collect_baseline_metrics, metrics_hashmap_to_vec, EvalMetricValue, Evaluation,
-    ExtensionRequirements,
+    EvalMetricValue, Evaluation, ExtensionRequirements, collect_baseline_metrics,
+    metrics_hashmap_to_vec,
 };
 use crate::register_evaluation;
 use async_trait::async_trait;

crates/goose-bench/src/eval_suites/core/computercontroller/web_scrape.rs

@@ -3,8 +3,8 @@
 use crate::bench_session::BenchAgent;
 use crate::bench_work_dir::BenchmarkWorkDir;
 use crate::eval_suites::{
-    collect_baseline_metrics, metrics_hashmap_to_vec, EvalMetricValue, Evaluation,
-    ExtensionRequirements,
+    EvalMetricValue, Evaluation, ExtensionRequirements, collect_baseline_metrics,
+    metrics_hashmap_to_vec,
 };
 use crate::register_evaluation;
 use async_trait::async_trait;

crates/goose-bench/src/eval_suites/core/developer/create_file.rs

@@ -3,8 +3,8 @@
 use crate::bench_session::BenchAgent;
 use crate::bench_work_dir::BenchmarkWorkDir;
 use crate::eval_suites::{
-    collect_baseline_metrics, metrics_hashmap_to_vec, EvalMetricValue, Evaluation,
-    ExtensionRequirements,
+    EvalMetricValue, Evaluation, ExtensionRequirements, collect_baseline_metrics,
+    metrics_hashmap_to_vec,
 };
 use crate::register_evaluation;
 use async_trait::async_trait;

crates/goose-bench/src/eval_suites/core/developer/list_files.rs

@@ -1,8 +1,8 @@
 use crate::bench_session::BenchAgent;
 use crate::bench_work_dir::BenchmarkWorkDir;
 use crate::eval_suites::{
-    collect_baseline_metrics, metrics_hashmap_to_vec, EvalMetricValue, Evaluation,
-    ExtensionRequirements,
+    EvalMetricValue, Evaluation, ExtensionRequirements, collect_baseline_metrics,
+    metrics_hashmap_to_vec,
 };
 use crate::register_evaluation;
 use async_trait::async_trait;

crates/goose-bench/src/eval_suites/core/developer/simple_repo_clone_test.rs

@@ -1,8 +1,8 @@
 use crate::bench_session::BenchAgent;
 use crate::bench_work_dir::BenchmarkWorkDir;
 use crate::eval_suites::{
-    collect_baseline_metrics, metrics_hashmap_to_vec, EvalMetricValue, Evaluation,
-    ExtensionRequirements,
+    EvalMetricValue, Evaluation, ExtensionRequirements, collect_baseline_metrics,
+    metrics_hashmap_to_vec,
 };
 use crate::register_evaluation;
 use async_trait::async_trait;

crates/goose-bench/src/eval_suites/core/developer_image/image.rs

@@ -1,8 +1,8 @@
 use crate::bench_session::BenchAgent;
 use crate::bench_work_dir::BenchmarkWorkDir;
 use crate::eval_suites::{
-    collect_baseline_metrics, metrics_hashmap_to_vec, EvalMetricValue, Evaluation,
-    ExtensionRequirements,
+    EvalMetricValue, Evaluation, ExtensionRequirements, collect_baseline_metrics,
+    metrics_hashmap_to_vec,
 };
 use crate::register_evaluation;
 use async_trait::async_trait;

crates/goose-bench/src/eval_suites/core/developer_search_replace/search_replace.rs

@@ -1,8 +1,8 @@
 use crate::bench_session::BenchAgent;
 use crate::bench_work_dir::BenchmarkWorkDir;
 use crate::eval_suites::{
-    collect_baseline_metrics, metrics_hashmap_to_vec, EvalMetricValue, Evaluation,
-    ExtensionRequirements,
+    EvalMetricValue, Evaluation, ExtensionRequirements, collect_baseline_metrics,
+    metrics_hashmap_to_vec,
 };
 use crate::register_evaluation;
 use async_trait::async_trait;
@@ -29,7 +29,7 @@ impl Evaluation for DeveloperSearchReplace {
             Err(_) => {
                 return Err(anyhow::anyhow!(
                     "Could not find kubernetes_swagger.json file"
-                ))
+                ));
             }
         };
         let mut source_file = run_loc.base_path.clone();

crates/goose-bench/src/eval_suites/core/memory/save_fact.rs

@@ -3,8 +3,8 @@
 use crate::bench_session::BenchAgent;
 use crate::bench_work_dir::BenchmarkWorkDir;
 use crate::eval_suites::{
-    collect_baseline_metrics, metrics_hashmap_to_vec, EvalMetricValue, Evaluation,
-    ExtensionRequirements,
+    EvalMetricValue, Evaluation, ExtensionRequirements, collect_baseline_metrics,
+    metrics_hashmap_to_vec,
 };
 use crate::register_evaluation;
 use async_trait::async_trait;

crates/goose-bench/src/eval_suites/mod.rs

@@ -6,6 +6,6 @@ mod utils;
 mod vibes;
 
 pub use evaluation::*;
-pub use factory::{register_eval, EvaluationSuite};
+pub use factory::{EvaluationSuite, register_eval};
 pub use metrics::*;
 pub use utils::*;

crates/goose-bench/src/eval_suites/vibes/blog_summary.rs

@@ -1,8 +1,8 @@
 use crate::bench_session::BenchAgent;
 use crate::bench_work_dir::BenchmarkWorkDir;
 use crate::eval_suites::{
-    collect_baseline_metrics, metrics_hashmap_to_vec, write_response_to_file, EvalMetricValue,
-    Evaluation, ExtensionRequirements,
+    EvalMetricValue, Evaluation, ExtensionRequirements, collect_baseline_metrics,
+    metrics_hashmap_to_vec, write_response_to_file,
 };
 use crate::register_evaluation;
 use async_trait::async_trait;

crates/goose-bench/src/eval_suites/vibes/flappy_bird.rs

@@ -1,8 +1,8 @@
 use crate::bench_session::BenchAgent;
 use crate::bench_work_dir::BenchmarkWorkDir;
 use crate::eval_suites::{
-    collect_baseline_metrics, metrics_hashmap_to_vec, EvalMetricValue, Evaluation,
-    ExtensionRequirements,
+    EvalMetricValue, Evaluation, ExtensionRequirements, collect_baseline_metrics,
+    metrics_hashmap_to_vec,
 };
 use crate::register_evaluation;
 use async_trait::async_trait;

crates/goose-bench/src/eval_suites/vibes/goose_wiki.rs

@@ -1,8 +1,8 @@
 use crate::bench_session::BenchAgent;
 use crate::bench_work_dir::BenchmarkWorkDir;
 use crate::eval_suites::{
-    collect_baseline_metrics, metrics_hashmap_to_vec, EvalMetricValue, Evaluation,
-    ExtensionRequirements,
+    EvalMetricValue, Evaluation, ExtensionRequirements, collect_baseline_metrics,
+    metrics_hashmap_to_vec,
 };
 use crate::register_evaluation;
 use async_trait::async_trait;

crates/goose-bench/src/eval_suites/vibes/restaurant_research.rs

@@ -1,8 +1,8 @@
 use crate::bench_session::BenchAgent;
 use crate::bench_work_dir::BenchmarkWorkDir;
 use crate::eval_suites::{
-    collect_baseline_metrics, metrics_hashmap_to_vec, write_response_to_file, EvalMetricValue,
-    Evaluation, ExtensionRequirements,
+    EvalMetricValue, Evaluation, ExtensionRequirements, collect_baseline_metrics,
+    metrics_hashmap_to_vec, write_response_to_file,
 };
 use crate::register_evaluation;
 use async_trait::async_trait;

crates/goose-bench/src/eval_suites/vibes/squirrel_census.rs

@@ -1,8 +1,8 @@
 use crate::bench_session::BenchAgent;
 use crate::bench_work_dir::BenchmarkWorkDir;
 use crate::eval_suites::{
-    collect_baseline_metrics, metrics_hashmap_to_vec, EvalMetricValue, Evaluation,
-    ExtensionRequirements,
+    EvalMetricValue, Evaluation, ExtensionRequirements, collect_baseline_metrics,
+    metrics_hashmap_to_vec,
 };
 use crate::register_evaluation;
 use async_trait::async_trait;

crates/goose-bench/src/runners/bench_runner.rs

@@ -19,10 +19,10 @@ impl BenchRunner {
             Some(path) => {
                 if !path.is_absolute() {
                     anyhow::bail!(
-                         "Config Error in '{}': 'output_dir' must be an absolute path, but found relative path: {}",
-                         config_path.display(),
-                         path.display()
-                     );
+                        "Config Error in '{}': 'output_dir' must be an absolute path, but found relative path: {}",
+                        config_path.display(),
+                        path.display()
+                    );
                 }
                 path.clone()
             }