Upgrade Rust dependencies (#1282)

josh-project · Sep 30, 2023 · e296d3a · e296d3a
1 parent b54968a
commit e296d3a
Show file tree

Hide file tree

Showing 12 changed files with 830 additions and 612 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,10 +10,63 @@ members = [
     "josh-ui",
 ]
 
-
-
 [profile.release]
 lto = true
 opt-level = 3
 codegen-units = 1
 
+[workspace.dependencies]
+defer = "0.1.0"
+env_logger = "0.10.0"
+futures = "0.3.28"
+gix = "0.54.1"
+hyper-reverse-proxy = "0.5.1"
+lazy_static = "1.4.0"
+libc = "0.2.148"
+regex = "1.9.5"
+rs_tracing= { version = "1.1.0", features = ["rs_tracing"] }
+serde = { version = "1.0.188", features = ["std", "derive"] }
+serde_json = "1.0.107"
+serde_yaml = "0.9.25"
+toml = "0.8.1"
+tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
+
+[workspace.dependencies.git2]
+default-features = false
+version = "0.18.1"
+
+[workspace.dependencies.juniper]
+version = "0.15.11"
+default-features = false
+features = ["expose-test-schema"]
+
+[workspace.dependencies.tokio]
+version = "1.32.0"
+features = [
+    "fs",
+    "rt-multi-thread",
+    "macros",
+    "io-std",
+    "io-util",
+    "net",
+    "process",
+    "signal",
+]
+
+[workspace.dependencies.tokio-util]
+version = "0.7.9"
+features = ["compat"]
+
+[workspace.dependencies.reqwest]
+version = "0.11.20"
+default-features = false
+features = ["blocking", "json"]
+
+[workspace.dependencies.tracing]
+version = "0.1.37"
+features = ["max_level_trace", "release_max_level_trace"]
+
+[workspace.dependencies.clap]
+version = "4.4.6"
+features = ["derive", "help", "std", "usage"]
+default-features = false
diff --git a/hyper_cgi/Cargo.toml b/hyper_cgi/Cargo.toml
@@ -8,19 +8,17 @@ description = "Run CGI scripts with hyper"
 repository = "https://github.com/josh-project/josh"
 readme = "README.md"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-futures = "0.3.28"
-tokio = { version = "1.28.2", features = ["full"] }
-tokio-util = { version = "0.7.8", features = ["compat"] }
-hyper = { version = "0.14.26", features = ["stream", "tcp", "server", "http1"] }
+futures = { workspace = true }
+tokio = { workspace = true }
+tokio-util = { workspace = true }
+hyper = { version = "0.14.27", features = ["stream", "tcp", "server", "http1"] }
 
-clap = { version = "4.3.0", optional = true }
-base64 = { version = "0.21.2", optional = true }
+clap = { version = "4.4.6", optional = true }
+base64 = { version = "0.21.4", optional = true }
 rand = { version = "0.8.5", optional = true, features = ["std"] }
 lazy_static = { version = "1.4.0", optional = true }
-hyper-reverse-proxy = "0.5.1"
+hyper-reverse-proxy = { workspace = true }
 
 [lib]
 name = "hyper_cgi"

diff --git a/josh-core/Cargo.toml b/josh-core/Cargo.toml
@@ -10,40 +10,34 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-backtrace = "0.3.67"
+backtrace = "0.3.69"
 bitvec = "1.0.1"
-defer= "0.1.0"
-env_logger = "0.10.0"
 git-version = "0.3.5"
-git2 = { version = "0.17.2", default-features = false }
+git2 = { workspace = true }
 glob = "0.3.1"
-handlebars = "4.3.7"
+handlebars = "4.4.0"
 hex = "0.4.3"
-indoc = "2.0.1"
-itertools = "0.10.5"
-lazy_static = "1.4.0"
-log = "0.4.18"
-percent-encoding = "2.2.0"
-pest= "2.6.0"
-pest_derive = "2.6.0"
-rayon = "1.7.0"
-regex = "1.8.3"
-rs_tracing= { version = "1.1.0", features = ["rs_tracing"] }
-serde = { version = "1.0.163", features = ["derive"] }
-serde_json= "1.0.96"
-serde_yaml = "0.9.21"
+indoc = "2.0.4"
+itertools = "0.11.0"
+lazy_static = { workspace = true }
+log = "0.4.20"
+percent-encoding = "2.3.0"
+pest = "2.7.4"
+pest_derive = "2.7.4"
+rayon = "1.8.0"
+regex = { workspace = true }
+rs_tracing = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
 sled = "0.34.7"
 strfmt = "0.2.4"
-toml = "0.7.4"
-tracing = "0.1.37"
-gix = "0.44.1"
-
-[dependencies.juniper]
-default-features = false
-version = "0.15.11"
-features = []
+toml = { workspace = true }
+tracing = { workspace = true }
+gix = { workspace = true }
+juniper = { workspace = true }
 
 [dependencies.chrono]
 default-features = false
 features = ["alloc", "std"]
-version = "0.4.25"
+version = "0.4.31"
diff --git a/josh-core/src/history.rs b/josh-core/src/history.rs
@@ -162,7 +162,7 @@ fn find_known(
     walk.push(input)?;
 
     let n_new = walk
-        .with_hide_callback(&|id| {
+        .with_hide_callback(&mut |id| {
             let k = transaction.known(filter, id);
             if k {
                 known.push(id)

diff --git a/josh-filter/Cargo.toml b/josh-filter/Cargo.toml
@@ -9,23 +9,15 @@ readme = "README.md"
 repository = "https://github.com/josh-project/josh"
 version = "22.4.15"
 
-
 [dependencies]
-josh = {path = "../josh-core" }
-env_logger = "0.10.0"
-serde = { version = "1.0.163", features = ["derive"] }
-serde_json= "1.0.96"
-serde_yaml = "0.9.21"
-defer= "0.1.0"
-gix = "0.44.1"
-clap = "4.3.0"
-rs_tracing= { version = "1.1.0", features = ["rs_tracing"] }
-
-[dependencies.git2]
-default-features = false
-version = "0.17.2"
-
-[dependencies.juniper]
-default-features = false
-version = "0.15.11"
-features = []
+josh = { path = "../josh-core" }
+env_logger = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+defer = { workspace = true }
+gix = { workspace = true }
+clap = { workspace = true }
+rs_tracing = { workspace = true }
+juniper = { workspace = true }
+git2 = { workspace = true }
diff --git a/josh-proxy/Cargo.toml b/josh-proxy/Cargo.toml
@@ -1,4 +1,3 @@
-
 [package]
 authors = ["Christian Schilling <[email protected]>"]
 description = "GIT virtualization proxy"
@@ -10,46 +9,38 @@ readme = "README.md"
 repository = "https://github.com/josh-project/josh"
 version = "22.4.15"
 
-
 [dependencies]
-base64 = "0.21.2"
-clap = "4.3.0"
-futures = "0.3.28"
-hyper = { version = "0.14.26", features = ["stream"] }
-hyper-reverse-proxy = "0.5.1"
+base64 = "0.21.4"
+clap = { workspace = true }
+futures = { workspace = true }
+hyper = { version = "0.14.27", features = ["stream"] }
+hyper-reverse-proxy = { workspace = true }
 hyper-staticfile = "0.9.5"
 hyper-tls = "0.5.0"
-hyper_cgi = {path = "../hyper_cgi"}
-indoc = "2.0.1"
+hyper_cgi = { path = "../hyper_cgi" }
+indoc = "2.0.4"
 josh = {path = "../josh-core" }
-lazy_static = "1.4.0"
-opentelemetry = "0.19.0"
-opentelemetry-jaeger = "0.18.0"
-percent-encoding = "2.2.0"
-regex = "1.8.3"
-reqwest= { version = "0.11.18", default-features = false, features = ["blocking", "json"] }
-serde= "1.0.163"
-serde_json= "1.0.96"
-serde_yaml = "0.9.21"
-tokio = { version = "1.28.2", features = ["full"] }
-toml = "0.7.4"
-tracing = { version = "0.1.37", features = ["max_level_trace", "release_max_level_trace"] }
+lazy_static = { workspace = true }
+opentelemetry = "0.20.0"
+opentelemetry-jaeger = "0.19.0"
+percent-encoding = "2.3.0"
+regex = { workspace = true }
+reqwest = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+tokio = { workspace = true }
+toml = { workspace = true }
+tracing = { workspace = true }
 tracing-futures = "0.2.5"
-tracing-opentelemetry = "0.19.0"
-tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-unindent = "0.2.1"
-url = "2.3.1"
-uuid = { version = "1.3.3", features = ["v4"] }
+tracing-opentelemetry = "0.21.0"
+tracing-subscriber = { workspace = true }
+unindent = "0.2.3"
+url = "2.4.1"
+uuid = { version = "1.4.1", features = ["v4"] }
 josh-rpc = { path = "../josh-rpc" }
-tokio-util = "0.7.8"
+tokio-util = { workspace = true }
 tempdir = "0.3.7"
-gix = "0.44.1"
-
-[dependencies.juniper]
-version = "0.15.11"
-default-features = false
-features = ["expose-test-schema"]
-
-[dependencies.git2]
-default-features = false
-version = "0.17.2"
+gix = { workspace = true }
+juniper = { workspace = true }
+git2 = { workspace = true }
diff --git a/josh-proxy/src/bin/josh-proxy.rs b/josh-proxy/src/bin/josh-proxy.rs
@@ -1303,7 +1303,7 @@ async fn call_service(
             .to_str()
             .ok_or(josh::josh_error("repo_path.to_str"))?,
     );
-    cmd.env("GIT_NAMESPACE", temp_ns.name().clone());
+    cmd.env("GIT_NAMESPACE", temp_ns.name());
     cmd.env("GIT_PROJECT_ROOT", repo_path);
     cmd.env("JOSH_REPO_UPDATE", serde_json::to_string(&repo_update)?);
     cmd.env("PATH_INFO", parsed_url.pathinfo.clone());

diff --git a/josh-proxy/src/lib.rs b/josh-proxy/src/lib.rs
@@ -493,8 +493,9 @@ fn create_repo_base(path: &PathBuf) -> josh::JoshResult<josh::shell::Shell> {
     let config_location = config_source.storage_location(&mut |_| None).unwrap();
     let config_location = path.join(config_location);
 
-    let mut config = gix::config::File::from_path_no_includes(&config_location, config_source)
-        .map_err(|_| josh_error("unable to open repo config file"))?;
+    let mut config =
+        gix::config::File::from_path_no_includes(config_location.clone(), config_source)
+            .map_err(|_| josh_error("unable to open repo config file"))?;
 
     config_options
         .iter()

diff --git a/josh-rpc/Cargo.toml b/josh-rpc/Cargo.toml
@@ -4,6 +4,6 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-serde = { version = "1.0.163", features = ["std", "derive"] }
-tokio = { version = "1.28.2", features = ["fs", "io-std"] }
-libc = "0.2.144"
+serde = { workspace = true }
+tokio = { workspace = true }
+libc = { workspace = true }
diff --git a/josh-ssh-shell/Cargo.toml b/josh-ssh-shell/Cargo.toml
@@ -4,19 +4,15 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-clap = { version = "4.3.0", features = ["derive", "help", "std", "usage"], default-features = false }
-libc = "0.2.144"
+clap = { workspace = true }
+libc = { workspace = true }
 shell-words = "1.1.0"
-tokio = { version = "1.28.2", features = ["fs", "rt-multi-thread", "macros", "io-std", "io-util", "net"] }
+tokio = { workspace = true }
 josh-rpc = { path = "../josh-rpc" }
-serde_json = "1.0.96"
-tracing = { version = "0.1.37", features = ["max_level_trace", "release_max_level_trace"] }
-tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-tokio-util = "0.7.8"
-thiserror = "1.0.40"
-tempfile = "3.5.0"
-
-[dependencies.reqwest]
-default-features = false
-version = "0.11.18"
-features = ["json"]
+serde_json = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+tokio-util = { workspace = true }
+thiserror = "1.0.49"
+tempfile = "3.8.0"
+reqwest = { workspace = true }
diff --git a/josh-ui/Cargo.toml b/josh-ui/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [build-dependencies]
 npm_rs = "1.0.0"
-dircpy = "0.3.14"
+dircpy = "0.3.15"
 
 [lib]
 path = 'lib.rs'