cleanup

Author: epompeii

lib/bencher_adapter/Cargo.toml

@@ -6,9 +6,13 @@ edition.workspace = true
 license-file.workspace = true
 publish = false
 
+[features]
+full = ["bencher_json/full"]
+lite = ["bencher_json/lite"]
+
 [dependencies]
 # Workspace
-bencher_json = { workspace = true, features = ["full"] }
+bencher_json.workspace = true
 literally.workspace = true
 ordered-float.workspace = true
 serde.workspace = true

lib/bencher_valid/Cargo.toml

@@ -17,10 +17,10 @@ plus = ["chrono/clock"]
 schema = ["dep:schemars", "ordered-float/schemars"]
 wasm = [
     "dep:console_error_panic_hook",
-    "dep:wasm-bindgen",
+    "dep:regex-lite",
     "dep:serde_json",
+    "dep:wasm-bindgen",
     "chrono/wasmbind",
-    "lite",
 ]
 
 [dependencies]

lib/bencher_valid/src/fingerprint/mod.rs

@@ -5,8 +5,6 @@ use derive_more::Display;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
-#[cfg(feature = "wasm")]
-use wasm_bindgen::prelude::*;
 
 use crate::ValidError;
 

lib/bencher_valid/src/fingerprint/target_os/windows.rs

@@ -9,7 +9,7 @@ impl crate::Fingerprint {
                 let uuid = hstring.to_string();
                 println!("{uuid}");
                 println!("{}", uuid.trim());
-                Uuid::parse_str(&uuid).ok()
+                Uuid::parse_str(&hstring.to_string().trim()).ok()
             })
             .map(Self)
     }

services/api/Cargo.toml

@@ -22,7 +22,7 @@ sentry = ["dep:sentry"]
 [dependencies]
 # Workspace
 async-trait.workspace = true
-bencher_adapter.workspace = true
+bencher_adapter = { workspace = true, features = ["full"] }
 bencher_billing = { workspace = true, optional = true }
 bencher_bing_index = { workspace = true, optional = true }
 bencher_boundary.workspace = true

services/cli/Cargo.toml

@@ -10,12 +10,12 @@ publish = false
 default = ["plus"]
 plus = ["bencher_client/plus", "bencher_comment/plus", "bencher_json/plus"]
 
-[build-dependencies]
-bencher_json = { workspace = true, features = ["lite"] }
+# [build-dependencies]
+# bencher_json = { workspace = true, features = ["lite"] }
 
 [dependencies]
 # Workspace
-bencher_adapter.workspace = true
+bencher_adapter = { workspace = true, features = ["lite"] }
 bencher_client.workspace = true
 bencher_comment.workspace = true
 bencher_json = { workspace = true, features = ["lite", "table"] }

services/cli/build.rs

@@ -1,5 +1,5 @@
 fn main() {
     // This is here to test that the fingerprinting is working correctly on all platforms.
-    #[allow(clippy::expect_used)]
-    let _ = bencher_json::Fingerprint::new().expect("Failed to create fingerprint");
+    // #[allow(clippy::expect_used)]
+    // let _ = bencher_json::Fingerprint::new().expect("Failed to create fingerprint");
 }

services/cli/src/bencher/sub/project/run/project.rs

@@ -1,7 +1,7 @@
-use bencher_fingerprint::Fingerprint;
+use bencher_json::{Fingerprint, GitHash};
 use gix::Repository;
 
-use crate::bencher::sub::project::run::branch::find_repo;
+use super::branch::find_repo;
 
 const ROOT: &str = "root";
 
@@ -13,8 +13,12 @@ pub fn local_project() {
     }
 
     if let Some(repo) = repo {
+        if let Some(branch) = current_branch_name(&repo) {
+            println!("{branch:?}");
+        }
+
         if let Some(root_commit) = find_default_branch_and_root_commit(&repo) {
-            println!("Root commit hash: {root_commit}");
+            println!("Root commit hash: {root_commit:?}");
         }
     }
 
@@ -33,12 +37,21 @@ fn repo_name(repo: Option<&Repository>) -> Option<String> {
     file_name.to_str().map(ToOwned::to_owned)
 }
 
-fn find_default_branch_and_root_commit(repo: &Repository) -> Option<String> {
-    let head_id = repo.head_id().ok()?;
-
-    let mut _rev_walk = repo.rev_walk([head_id]);
-
-    // let root_commit = rev_walk.all().into_iter().last()?.id().to_string();
+fn current_branch_name(repo: &Repository) -> Option<(String, String)> {
+    repo.head().ok()?.referent_name().map(|name| {
+        (
+            String::from_utf8_lossy(name.as_bstr()).to_string(),
+            String::from_utf8_lossy(name.shorten()).to_string(),
+        )
+    })
+}
 
-    None
+fn find_default_branch_and_root_commit(repo: &Repository) -> Option<GitHash> {
+    let head_id = repo.head_id().ok()?;
+    let rev_walk = repo.rev_walk([head_id]).all().ok()?;
+    if let Some(Ok(commit)) = rev_walk.last() {
+        Some(commit.id().object().ok()?.id.into())
+    } else {
+        None
+    }
 }