Skip to content

Commit e296d3a

Browse files
vlad-ivanov-namevlad-ivanov-name
authored
Upgrade Rust dependencies (#1282)
1 parent b54968a commit e296d3a

File tree

12 files changed

+830
-612
lines changed

12 files changed

+830
-612
lines changed

‎Cargo.lock‎

Lines changed: 689 additions & 496 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,63 @@ members = [
1010
"josh-ui",
1111
]
1212

13-
14-
1513
[profile.release]
1614
lto = true
1715
opt-level = 3
1816
codegen-units = 1
1917

18+
[workspace.dependencies]
19+
defer = "0.1.0"
20+
env_logger = "0.10.0"
21+
futures = "0.3.28"
22+
gix = "0.54.1"
23+
hyper-reverse-proxy = "0.5.1"
24+
lazy_static = "1.4.0"
25+
libc = "0.2.148"
26+
regex = "1.9.5"
27+
rs_tracing= { version = "1.1.0", features = ["rs_tracing"] }
28+
serde = { version = "1.0.188", features = ["std", "derive"] }
29+
serde_json = "1.0.107"
30+
serde_yaml = "0.9.25"
31+
toml = "0.8.1"
32+
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
33+
34+
[workspace.dependencies.git2]
35+
default-features = false
36+
version = "0.18.1"
37+
38+
[workspace.dependencies.juniper]
39+
version = "0.15.11"
40+
default-features = false
41+
features = ["expose-test-schema"]
42+
43+
[workspace.dependencies.tokio]
44+
version = "1.32.0"
45+
features = [
46+
"fs",
47+
"rt-multi-thread",
48+
"macros",
49+
"io-std",
50+
"io-util",
51+
"net",
52+
"process",
53+
"signal",
54+
]
55+
56+
[workspace.dependencies.tokio-util]
57+
version = "0.7.9"
58+
features = ["compat"]
59+
60+
[workspace.dependencies.reqwest]
61+
version = "0.11.20"
62+
default-features = false
63+
features = ["blocking", "json"]
64+
65+
[workspace.dependencies.tracing]
66+
version = "0.1.37"
67+
features = ["max_level_trace", "release_max_level_trace"]
68+
69+
[workspace.dependencies.clap]
70+
version = "4.4.6"
71+
features = ["derive", "help", "std", "usage"]
72+
default-features = false

‎hyper_cgi/Cargo.toml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,17 @@ description = "Run CGI scripts with hyper"
88
repository = "https://github.com/josh-project/josh"
99
readme = "README.md"
1010

11-
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
12-
1311
[dependencies]
14-
futures = "0.3.28"
15-
tokio = { version = "1.28.2", features = ["full"] }
16-
tokio-util = { version = "0.7.8", features = ["compat"] }
17-
hyper = { version = "0.14.26", features = ["stream", "tcp", "server", "http1"] }
12+
futures = { workspace = true }
13+
tokio = { workspace = true }
14+
tokio-util = { workspace = true }
15+
hyper = { version = "0.14.27", features = ["stream", "tcp", "server", "http1"] }
1816

19-
clap = { version = "4.3.0", optional = true }
20-
base64 = { version = "0.21.2", optional = true }
17+
clap = { version = "4.4.6", optional = true }
18+
base64 = { version = "0.21.4", optional = true }
2119
rand = { version = "0.8.5", optional = true, features = ["std"] }
2220
lazy_static = { version = "1.4.0", optional = true }
23-
hyper-reverse-proxy = "0.5.1"
21+
hyper-reverse-proxy = { workspace = true }
2422

2523
[lib]
2624
name = "hyper_cgi"

‎josh-core/Cargo.toml‎

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,34 @@ readme = "README.md"
1010
edition = "2018"
1111

1212
[dependencies]
13-
backtrace = "0.3.67"
13+
backtrace = "0.3.69"
1414
bitvec = "1.0.1"
15-
defer= "0.1.0"
16-
env_logger = "0.10.0"
1715
git-version = "0.3.5"
18-
git2 = { version = "0.17.2", default-features = false }
16+
git2 = { workspace = true }
1917
glob = "0.3.1"
20-
handlebars = "4.3.7"
18+
handlebars = "4.4.0"
2119
hex = "0.4.3"
22-
indoc = "2.0.1"
23-
itertools = "0.10.5"
24-
lazy_static = "1.4.0"
25-
log = "0.4.18"
26-
percent-encoding = "2.2.0"
27-
pest= "2.6.0"
28-
pest_derive = "2.6.0"
29-
rayon = "1.7.0"
30-
regex = "1.8.3"
31-
rs_tracing= { version = "1.1.0", features = ["rs_tracing"] }
32-
serde = { version = "1.0.163", features = ["derive"] }
33-
serde_json= "1.0.96"
34-
serde_yaml = "0.9.21"
20+
indoc = "2.0.4"
21+
itertools = "0.11.0"
22+
lazy_static = { workspace = true }
23+
log = "0.4.20"
24+
percent-encoding = "2.3.0"
25+
pest = "2.7.4"
26+
pest_derive = "2.7.4"
27+
rayon = "1.8.0"
28+
regex = { workspace = true }
29+
rs_tracing = { workspace = true }
30+
serde = { workspace = true }
31+
serde_json = { workspace = true }
32+
serde_yaml = { workspace = true }
3533
sled = "0.34.7"
3634
strfmt = "0.2.4"
37-
toml = "0.7.4"
38-
tracing = "0.1.37"
39-
gix = "0.44.1"
40-
41-
[dependencies.juniper]
42-
default-features = false
43-
version = "0.15.11"
44-
features = []
35+
toml = { workspace = true }
36+
tracing = { workspace = true }
37+
gix = { workspace = true }
38+
juniper = { workspace = true }
4539

4640
[dependencies.chrono]
4741
default-features = false
4842
features = ["alloc", "std"]
49-
version = "0.4.25"
43+
version = "0.4.31"

‎josh-core/src/history.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ fn find_known(
162162
walk.push(input)?;
163163

164164
let n_new = walk
165-
.with_hide_callback(&|id| {
165+
.with_hide_callback(&mut |id| {
166166
let k = transaction.known(filter, id);
167167
if k {
168168
known.push(id)

‎josh-filter/Cargo.toml‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,15 @@ readme = "README.md"
99
repository = "https://github.com/josh-project/josh"
1010
version = "22.4.15"
1111

12-
1312
[dependencies]
14-
josh = {path = "../josh-core" }
15-
env_logger = "0.10.0"
16-
serde = { version = "1.0.163", features = ["derive"] }
17-
serde_json= "1.0.96"
18-
serde_yaml = "0.9.21"
19-
defer= "0.1.0"
20-
gix = "0.44.1"
21-
clap = "4.3.0"
22-
rs_tracing= { version = "1.1.0", features = ["rs_tracing"] }
23-
24-
[dependencies.git2]
25-
default-features = false
26-
version = "0.17.2"
27-
28-
[dependencies.juniper]
29-
default-features = false
30-
version = "0.15.11"
31-
features = []
13+
josh = { path = "../josh-core" }
14+
env_logger = { workspace = true }
15+
serde = { workspace = true }
16+
serde_json = { workspace = true }
17+
serde_yaml = { workspace = true }
18+
defer = { workspace = true }
19+
gix = { workspace = true }
20+
clap = { workspace = true }
21+
rs_tracing = { workspace = true }
22+
juniper = { workspace = true }
23+
git2 = { workspace = true }

‎josh-proxy/Cargo.toml‎

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
[package]
32
authors = ["Christian Schilling <christian.schilling@esrlabs.com>"]
43
description = "GIT virtualization proxy"
@@ -10,46 +9,38 @@ readme = "README.md"
109
repository = "https://github.com/josh-project/josh"
1110
version = "22.4.15"
1211

13-
1412
[dependencies]
15-
base64 = "0.21.2"
16-
clap = "4.3.0"
17-
futures = "0.3.28"
18-
hyper = { version = "0.14.26", features = ["stream"] }
19-
hyper-reverse-proxy = "0.5.1"
13+
base64 = "0.21.4"
14+
clap = { workspace = true }
15+
futures = { workspace = true }
16+
hyper = { version = "0.14.27", features = ["stream"] }
17+
hyper-reverse-proxy = { workspace = true }
2018
hyper-staticfile = "0.9.5"
2119
hyper-tls = "0.5.0"
22-
hyper_cgi = {path = "../hyper_cgi"}
23-
indoc = "2.0.1"
20+
hyper_cgi = { path = "../hyper_cgi" }
21+
indoc = "2.0.4"
2422
josh = {path = "../josh-core" }
25-
lazy_static = "1.4.0"
26-
opentelemetry = "0.19.0"
27-
opentelemetry-jaeger = "0.18.0"
28-
percent-encoding = "2.2.0"
29-
regex = "1.8.3"
30-
reqwest= { version = "0.11.18", default-features = false, features = ["blocking", "json"] }
31-
serde= "1.0.163"
32-
serde_json= "1.0.96"
33-
serde_yaml = "0.9.21"
34-
tokio = { version = "1.28.2", features = ["full"] }
35-
toml = "0.7.4"
36-
tracing = { version = "0.1.37", features = ["max_level_trace", "release_max_level_trace"] }
23+
lazy_static = { workspace = true }
24+
opentelemetry = "0.20.0"
25+
opentelemetry-jaeger = "0.19.0"
26+
percent-encoding = "2.3.0"
27+
regex = { workspace = true }
28+
reqwest = { workspace = true }
29+
serde = { workspace = true }
30+
serde_json = { workspace = true }
31+
serde_yaml = { workspace = true }
32+
tokio = { workspace = true }
33+
toml = { workspace = true }
34+
tracing = { workspace = true }
3735
tracing-futures = "0.2.5"
38-
tracing-opentelemetry = "0.19.0"
39-
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
40-
unindent = "0.2.1"
41-
url = "2.3.1"
42-
uuid = { version = "1.3.3", features = ["v4"] }
36+
tracing-opentelemetry = "0.21.0"
37+
tracing-subscriber = { workspace = true }
38+
unindent = "0.2.3"
39+
url = "2.4.1"
40+
uuid = { version = "1.4.1", features = ["v4"] }
4341
josh-rpc = { path = "../josh-rpc" }
44-
tokio-util = "0.7.8"
42+
tokio-util = { workspace = true }
4543
tempdir = "0.3.7"
46-
gix = "0.44.1"
47-
48-
[dependencies.juniper]
49-
version = "0.15.11"
50-
default-features = false
51-
features = ["expose-test-schema"]
52-
53-
[dependencies.git2]
54-
default-features = false
55-
version = "0.17.2"
44+
gix = { workspace = true }
45+
juniper = { workspace = true }
46+
git2 = { workspace = true }

‎josh-proxy/src/bin/josh-proxy.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ async fn call_service(
13031303
.to_str()
13041304
.ok_or(josh::josh_error("repo_path.to_str"))?,
13051305
);
1306-
cmd.env("GIT_NAMESPACE", temp_ns.name().clone());
1306+
cmd.env("GIT_NAMESPACE", temp_ns.name());
13071307
cmd.env("GIT_PROJECT_ROOT", repo_path);
13081308
cmd.env("JOSH_REPO_UPDATE", serde_json::to_string(&repo_update)?);
13091309
cmd.env("PATH_INFO", parsed_url.pathinfo.clone());

‎josh-proxy/src/lib.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,8 +493,9 @@ fn create_repo_base(path: &PathBuf) -> josh::JoshResult<josh::shell::Shell> {
493493
let config_location = config_source.storage_location(&mut |_| None).unwrap();
494494
let config_location = path.join(config_location);
495495

496-
let mut config = gix::config::File::from_path_no_includes(&config_location, config_source)
497-
.map_err(|_| josh_error("unable to open repo config file"))?;
496+
let mut config =
497+
gix::config::File::from_path_no_includes(config_location.clone(), config_source)
498+
.map_err(|_| josh_error("unable to open repo config file"))?;
498499

499500
config_options
500501
.iter()

‎josh-rpc/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ version = "0.1.0"
44
edition = "2018"
55

66
[dependencies]
7-
serde = { version = "1.0.163", features = ["std", "derive"] }
8-
tokio = { version = "1.28.2", features = ["fs", "io-std"] }
9-
libc = "0.2.144"
7+
serde = { workspace = true }
8+
tokio = { workspace = true }
9+
libc = { workspace = true }

0 commit comments

Comments
 (0)