From 7bc9479a1176da6ada7faa504f5bc8f0f8d1fa27 Mon Sep 17 00:00:00 2001 From: geoffsee <> Date: Sun, 31 Aug 2025 13:24:51 -0400 Subject: [PATCH] fix format issues, needs precommit hook --- Cargo.lock | 16 +++++++-------- crates/cli/build.rs | 11 +++-------- crates/cli/bun_target.rs | 42 +++++++++++++++++++++++----------------- 3 files changed, 35 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ddaa099..9486d27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -898,7 +898,7 @@ checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" [[package]] name = "cli" -version = "0.1.1" +version = "0.1.2" [[package]] name = "codee" @@ -1476,7 +1476,7 @@ dependencies = [ [[package]] name = "embeddings-engine" -version = "0.1.1" +version = "0.1.2" dependencies = [ "async-openai", "axum", @@ -2098,7 +2098,7 @@ dependencies = [ [[package]] name = "gemma-runner" -version = "0.1.1" +version = "0.1.2" dependencies = [ "anyhow", "candle-core 0.9.1 (git+https://github.com/huggingface/candle.git)", @@ -2279,7 +2279,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "helm-chart-tool" -version = "0.1.1" +version = "0.1.2" dependencies = [ "anyhow", "clap", @@ -2689,7 +2689,7 @@ dependencies = [ [[package]] name = "inference-engine" -version = "0.1.1" +version = "0.1.2" dependencies = [ "ab_glyph", "anyhow", @@ -2941,7 +2941,7 @@ dependencies = [ [[package]] name = "leptos-app" -version = "0.1.1" +version = "0.1.2" dependencies = [ "async-openai-wasm", "axum", @@ -3204,7 +3204,7 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "llama-runner" -version = "0.1.1" +version = "0.1.2" dependencies = [ "anyhow", "candle-core 0.9.1 (git+https://github.com/huggingface/candle.git)", @@ -4083,7 +4083,7 @@ dependencies = [ [[package]] name = "predict-otron-9000" -version = "0.1.1" +version = "0.1.2" dependencies = [ "axum", "embeddings-engine", diff --git a/crates/cli/build.rs b/crates/cli/build.rs index 1d12d22..87a19e9 100644 --- a/crates/cli/build.rs +++ b/crates/cli/build.rs @@ -17,10 +17,6 @@ fn main() { } } - - - - fn run_build() -> io::Result<()> { let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set")); @@ -33,7 +29,9 @@ fn run_build() -> io::Result<()> { // Optional: warn if using a Bun target that’s marked unsupported in your chart if matches!(bun_tgt, BunTarget::WindowsArm64) { - println!("cargo:warning=bun-windows-arm64 is marked unsupported in the compatibility chart"); + println!( + "cargo:warning=bun-windows-arm64 is marked unsupported in the compatibility chart" + ); } warn(&format!("Building CLI into: {}", output_path.display())); @@ -64,9 +62,6 @@ fn run_build() -> io::Result<()> { let target = env::var("TARGET").unwrap(); - - - // --- bun build (in ./package), emit to OUT_DIR, keep temps inside OUT_DIR --- let mut build = Command::new("bun") .current_dir(&package_dir) diff --git a/crates/cli/bun_target.rs b/crates/cli/bun_target.rs index cbd2e61..6f5797b 100644 --- a/crates/cli/bun_target.rs +++ b/crates/cli/bun_target.rs @@ -16,28 +16,29 @@ pub enum BunTarget { impl BunTarget { pub const fn as_bun_flag(self) -> &'static str { match self { - BunTarget::LinuxX64Glibc => "bun-linux-x64", + BunTarget::LinuxX64Glibc => "bun-linux-x64", BunTarget::LinuxArm64Glibc => "bun-linux-arm64", - BunTarget::LinuxX64Musl => "bun-linux-x64-musl", - BunTarget::LinuxArm64Musl => "bun-linux-arm64-musl", - BunTarget::WindowsX64 => "bun-windows-x64", - BunTarget::WindowsArm64 => "bun-windows-arm64", - BunTarget::MacX64 => "bun-darwin-x64", - BunTarget::MacArm64 => "bun-darwin-arm64", + BunTarget::LinuxX64Musl => "bun-linux-x64-musl", + BunTarget::LinuxArm64Musl => "bun-linux-arm64-musl", + BunTarget::WindowsX64 => "bun-windows-x64", + BunTarget::WindowsArm64 => "bun-windows-arm64", + BunTarget::MacX64 => "bun-darwin-x64", + BunTarget::MacArm64 => "bun-darwin-arm64", } } - pub const fn rust_triples(self) -> &'static [&'static str] { match self { - BunTarget::LinuxX64Glibc => &["x86_64-unknown-linux-gnu", "x86_64-unknown-linux-gnu.2.17"], + BunTarget::LinuxX64Glibc => { + &["x86_64-unknown-linux-gnu", "x86_64-unknown-linux-gnu.2.17"] + } BunTarget::LinuxArm64Glibc => &["aarch64-unknown-linux-gnu"], - BunTarget::LinuxX64Musl => &["x86_64-unknown-linux-musl"], - BunTarget::LinuxArm64Musl => &["aarch64-unknown-linux-musl"], - BunTarget::WindowsX64 => &["x86_64-pc-windows-msvc"], - BunTarget::WindowsArm64 => &["aarch64-pc-windows-msvc"], // chart says unsupported; still map - BunTarget::MacX64 => &["x86_64-apple-darwin"], - BunTarget::MacArm64 => &["aarch64-apple-darwin"], + BunTarget::LinuxX64Musl => &["x86_64-unknown-linux-musl"], + BunTarget::LinuxArm64Musl => &["aarch64-unknown-linux-musl"], + BunTarget::WindowsX64 => &["x86_64-pc-windows-msvc"], + BunTarget::WindowsArm64 => &["aarch64-pc-windows-msvc"], // chart says unsupported; still map + BunTarget::MacX64 => &["x86_64-apple-darwin"], + BunTarget::MacArm64 => &["aarch64-apple-darwin"], } } @@ -86,7 +87,6 @@ impl BunTarget { None } - pub fn from_cargo_env() -> Result { if let Ok(triple) = env::var("TARGET") { if let Some(bt) = Self::from_rust_target(&triple) { @@ -95,12 +95,18 @@ impl BunTarget { return Err(BunTargetError::UnknownTriple(triple)); } - let os = env::var("CARGO_CFG_TARGET_OS").unwrap_or_default(); + let os = env::var("CARGO_CFG_TARGET_OS").unwrap_or_default(); let arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap_or_default(); let envv = env::var("CARGO_CFG_TARGET_ENV").unwrap_or_default(); let vendor = env::var("CARGO_CFG_TARGET_VENDOR").unwrap_or_else(|_| "unknown".into()); - let triple = format!("{}-{}-{}-{}", arch, vendor, os, if envv.is_empty() { "gnu" } else { &envv }); + let triple = format!( + "{}-{}-{}-{}", + arch, + vendor, + os, + if envv.is_empty() { "gnu" } else { &envv } + ); if let Some(bt) = Self::from_rust_target(&triple) { Ok(bt) } else {