From ac73a57ab00af1dbec5ef7d2122ffa5ee9cdcdc2 Mon Sep 17 00:00:00 2001 From: Douwe Osinga Date: Tue, 10 Mar 2026 17:09:37 -0400 Subject: [PATCH] Fix some dependencies (#7794) Co-authored-by: Douwe Osinga --- Cargo.lock | 43 ++++++++++++--------------------- crates/goose/Cargo.toml | 6 ++--- crates/goose/src/config/base.rs | 6 ++--- 3 files changed, 21 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 760c604325..da6905c3a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1902,7 +1902,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa510b739c618c679375ea9c5af44ce9f591289546e874ad5910e7ce7df79844" dependencies = [ "console 0.15.11", - "indicatif 0.18.3", + "indicatif", "once_cell", "strsim", "textwrap", @@ -4319,7 +4319,7 @@ dependencies = [ "opentelemetry-otlp", "opentelemetry-stdout", "opentelemetry_sdk", - "paste", + "pastey", "pctx_code_mode", "posthog-rs", "pulldown-cmark", @@ -4446,7 +4446,7 @@ dependencies = [ "goose", "goose-acp", "goose-mcp", - "indicatif 0.18.3", + "indicatif", "open", "rand 0.8.5", "regex", @@ -4739,13 +4739,13 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hf-hub" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629d8f3bbeda9d148036d6b0de0a3ab947abd08ce90626327fc3547a49d59d97" +checksum = "aef3982638978efa195ff11b305f51f1f22f4f0a6cabee7af79b383ebee6a213" dependencies = [ "dirs 6.0.0", "futures", - "indicatif 0.17.11", + "indicatif", "libc", "log", "num_cpus", @@ -4755,7 +4755,7 @@ dependencies = [ "serde_json", "thiserror 2.0.18", "tokio", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5317,19 +5317,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "indicatif" -version = "0.17.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" -dependencies = [ - "console 0.15.11", - "number_prefix", - "portable-atomic", - "unicode-width 0.2.2", - "web-time", -] - [[package]] name = "indicatif" version = "0.18.3" @@ -6370,12 +6357,6 @@ dependencies = [ "libc", ] -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - [[package]] name = "oauth2" version = "5.0.0" @@ -7352,16 +7333,20 @@ dependencies = [ [[package]] name = "posthog-rs" -version = "0.3.7" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610d236077c94c96194b0d2b40989bda4bf8faf60e15a0da6ef8ffd4c78f6c1c" +checksum = "8f42508f04262bd31d4865363a2f665d56e337a8ddbc1de02c006697c489312a" dependencies = [ "chrono", "derive_builder", + "regex", "reqwest 0.11.27", "semver", "serde", "serde_json", + "sha1", + "tokio", + "tracing", "uuid", ] @@ -8012,6 +7997,7 @@ version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ + "async-compression", "base64 0.21.7", "bytes", "encoding_rs", @@ -8038,6 +8024,7 @@ dependencies = [ "system-configuration 0.5.1", "tokio", "tokio-rustls 0.24.1", + "tokio-util", "tower-service", "url", "wasm-bindgen", diff --git a/crates/goose/Cargo.toml b/crates/goose/Cargo.toml index 6b346581d2..839c9b59cc 100644 --- a/crates/goose/Cargo.toml +++ b/crates/goose/Cargo.toml @@ -110,7 +110,7 @@ candle-nn = { version = "0.9", default-features = false } candle-transformers = { version = "0.9", default-features = false } byteorder = "1.5.0" tokenizers = { version = "0.21.0", default-features = false, features = ["onig"] } -hf-hub = { version = "0.4.3", default-features = false, features = ["tokio"] } +hf-hub = { version = "0.5.0", default-features = false, features = ["tokio"] } symphonia = { version = "0.5", features = ["all"] } rubato = "0.16" zip = "0.6" @@ -120,8 +120,7 @@ schemars = { workspace = true, features = [ "derive", ] } insta = "1.43.2" -paste = "1.0.0" -posthog-rs = "0.3.7" +posthog-rs = "0.4.3" shellexpand = { workspace = true } indexmap = "2.12.0" ignore = { workspace = true } @@ -142,6 +141,7 @@ unbinder = "0.1.7" pulldown-cmark = "0.13.0" llama-cpp-2 = { version = "0.1.137", features = ["sampler"] } encoding_rs = "0.8.35" +pastey = "0.2.1" [target.'cfg(target_os = "windows")'.dependencies] winapi = { version = "0.3", features = ["wincred"] } diff --git a/crates/goose/src/config/base.rs b/crates/goose/src/config/base.rs index 7fdc84be7a..51a5f460b0 100644 --- a/crates/goose/src/config/base.rs +++ b/crates/goose/src/config/base.rs @@ -158,12 +158,12 @@ pub trait ConfigValue { macro_rules! config_value { ($key:ident, $type:ty) => { impl Config { - paste::paste! { + pastey::paste! { pub fn [](&self) -> Result<$type, ConfigError> { self.get_param(stringify!($key)) } } - paste::paste! { + pastey::paste! { pub fn [](&self, v: impl Into<$type>) -> Result<(), ConfigError> { self.set_param(stringify!($key), &v.into()) } @@ -172,7 +172,7 @@ macro_rules! config_value { }; ($key:ident, $inner:ty, $default:expr) => { - paste::paste! { + pastey::paste! { #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[serde(transparent)] pub struct [<$key:camel>]($inner);