Merge pull request #11139 from Byron/fix

Rust dependencies maintenance

Author: Byron

Cargo.lock

@@ -120,6 +120,10 @@ but-gerrit = { path = "crates/but-gerrit" }
 but-cherry-apply = { path = "crates/but-cherry-apply" }
 but-github = { path = "crates/but-github" }
 open = "5.3.2"
+regex = { version = "1.11.3", default-features = false, features = ["std", "unicode" ] }
+clap = { version = "4.5.51", default-features = false, features = ["derive", "std", "help"]}
+tracing-forest = { version = "0.3.0" }
+sysinfo = { version = "0.37.2", default-features = false }
 
 [profile.release]
 # There are no overrides here as we optimise for fast release builds,
@@ -151,6 +155,8 @@ gix-actor = { opt-level = 3 }
 gix-config = { opt-level = 3 }
 sha1-checked = { opt-level = 3 }
 zlib-rs = { opt-level = 3 }
+serde = { opt-level = 3 }
+serde_json = { opt-level = 3 }
 # This one is special as we can run into debug assertions otherwise.
 # They have a time, but let's chose the time instead of always being hit by it.
 gix-merge = { opt-level = 3, debug-assertions = false }

Cargo.toml

@@ -13,4 +13,4 @@ doctest = false
 [dependencies]
 syn = "2"
 quote = "1"
-convert_case = "0.8"
+convert_case = "0.9.0"

crates/but-api-macros/Cargo.toml

@@ -22,4 +22,4 @@ anyhow.workspace = true
 gitbutler-user.workspace = true
 serde_json.workspace = true
 reqwest = { workspace = true, features = ["json"] }
-octorust = "0.10.0"
+octorust = { version = "0.10.0", default-features = false }

crates/but-github/Cargo.toml

@@ -249,17 +249,16 @@ impl Graph {
         options: Options,
     ) -> anyhow::Result<Self> {
         let (repo, meta, _entrypoint) = Overlay::default().into_parts(tip.repo, meta);
-        Graph::from_commit_traversal_inner(tip.detach(), &repo, ref_name, &meta, options)
+        Graph::from_commit_traversal_inner(tip.detach(), &repo, ref_name.into(), &meta, options)
     }
 
     fn from_commit_traversal_inner<T: RefMetadata>(
         tip: gix::ObjectId,
         repo: &OverlayRepo<'_>,
-        ref_name: impl Into<Option<gix::refs::FullName>>,
+        ref_name: Option<gix::refs::FullName>,
         meta: &OverlayMetadata<'_, T>,
         options: Options,
     ) -> anyhow::Result<Self> {
-        let ref_name = ref_name.into();
         {
             if let Some(name) = &ref_name {
                 let span = tracing::Span::current();

crates/but-graph/src/init/mod.rs

@@ -13,7 +13,7 @@ doctest = false
 anyhow.workspace = true
 itertools.workspace = true
 serde.workspace = true
-regex = "1.11.3"
+regex = { workspace = true, features = ["perf"] }
 gix = { workspace = true }
 chrono.workspace = true
 serde_regex = "1.1.0"

crates/but-rules/Cargo.toml

@@ -42,5 +42,5 @@ gitbutler-project.workspace = true
 gitbutler-watcher.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
-tracing-forest = { version = "0.2.0" }
+tracing-forest.workspace = true
 but-secret.workspace = true

crates/but-server/Cargo.toml

@@ -34,11 +34,11 @@ gitbutler-reference.workspace = true
 
 gitbutler-commit = { workspace = true, optional = true, features = ["testing"] }
 
-clap = { version = "4.5.51", features = ["derive", "env"] }
+clap = { workspace = true, features = ["env"] }
 gix.workspace = true
 anyhow.workspace = true
 itertools.workspace = true
-tracing-forest = { version = "0.2.0" }
+tracing-forest.workspace = true
 tracing-subscriber.workspace = true
 tracing.workspace = true
 dirs-next = "2.0.0"

crates/but-testing/Cargo.toml

@@ -19,7 +19,7 @@ termtree = "0.5.1"
 gix-testtools.workspace = true
 but-graph.workspace = true
 but-core.workspace = true
-regex = "1.11.3"
+regex = { workspace = true }
 snapbox = { workspace = true, optional = true }
 
 [dev-dependencies]

crates/but-testsupport/Cargo.toml

@@ -22,16 +22,14 @@ posthog-rs = { version = "0.3.7" }
 serde.workspace = true
 tokio = { workspace = true, features = ["rt-multi-thread", "io-std"] }
 strum = { version = "0.27", features = ["derive"] }
-clap = { version = "4.5.51", features = ["derive", "env", "wrap_help"] }
+clap = { workspace = true, features = ["env", "wrap_help", "color", "error-context", "usage", "suggestions" ] }
 clap_complete = "4.5.60"
 chrono.workspace = true
 bstr.workspace = true
-regex = "1.11.3"
+regex.workspace = true
 anyhow.workspace = true
-# rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", branch = "main" }
 rmcp.workspace = true
 command-group = { version = "5.0.1", features = ["with-tokio"] }
-sysinfo = "0.37.1"
 gitbutler-project.workspace = true
 gix.workspace = true
 but-core.workspace = true
@@ -63,12 +61,12 @@ colored = "3.0.0"
 serde_json.workspace = true
 terminal_size = "0.4.3"
 tracing.workspace = true
-tracing-subscriber = { version = "0.3", features = [
+tracing-subscriber = { workspace = true, features = [
     "env-filter",
     "std",
     "fmt",
 ] }
-tracing-forest = { version = "0.2.0" }
+tracing-forest.workspace = true
 ratatui = "0.29.0"
 crossterm = "0.29.0"
 atty = "0.2.0"