Skip to content

Commit 5a650df

Browse files
committed
Update rust version and deps
Upgrade to rust 1.75 Run cargo update Run cargo upgrade
1 parent 2851e36 commit 5a650df

File tree

9 files changed

+191
-180
lines changed

9 files changed

+191
-180
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@ codegen-units = 1
1717

1818
[workspace.dependencies]
1919
defer = "0.1.0"
20-
env_logger = "0.10.0"
21-
futures = "0.3.28"
20+
env_logger = "0.10.2"
21+
futures = "0.3.30"
2222
gix = "0.54.1"
2323
hyper-reverse-proxy = "0.5.1"
2424
lazy_static = "1.4.0"
25-
libc = "0.2.148"
26-
regex = "1.9.5"
25+
libc = "0.2.153"
26+
regex = "1.10.3"
2727
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"] }
28+
serde = { version = "1.0.197", features = ["std", "derive"] }
29+
serde_json = "1.0.114"
30+
serde_yaml = "0.9.32"
31+
toml = "0.8.10"
32+
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
3333

3434
[workspace.dependencies.git2]
3535
default-features = false
36-
version = "0.18.1"
36+
version = "0.18.2"
3737

3838
[workspace.dependencies.juniper]
39-
version = "0.15.11"
39+
version = "0.15.12"
4040
default-features = false
4141
features = ["expose-test-schema"]
4242

4343
[workspace.dependencies.tokio]
44-
version = "1.32.0"
44+
version = "1.36.0"
4545
features = [
4646
"fs",
4747
"rt-multi-thread",
@@ -54,19 +54,19 @@ features = [
5454
]
5555

5656
[workspace.dependencies.tokio-util]
57-
version = "0.7.9"
57+
version = "0.7.10"
5858
features = ["compat"]
5959

6060
[workspace.dependencies.reqwest]
61-
version = "0.11.20"
61+
version = "0.11.25"
6262
default-features = false
6363
features = ["blocking", "json"]
6464

6565
[workspace.dependencies.tracing]
66-
version = "0.1.37"
66+
version = "0.1.40"
6767
features = ["max_level_trace", "release_max_level_trace"]
6868

6969
[workspace.dependencies.clap]
70-
version = "4.4.6"
70+
version = "4.5.2"
7171
features = ["derive", "help", "std", "usage"]
7272
default-features = false

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV PATH=/usr/local/cargo/bin:${PATH}
1313

1414
ARG ARCH
1515
ARG RUSTUP_VERSION=1.26.0
16-
ARG RUST_VERSION=1.74
16+
ARG RUST_VERSION=1.75.0
1717
ARG RUST_ARCH=${ARCH}-unknown-linux-musl
1818

1919
# https://github.com/sfackler/rust-openssl/issues/1462

hyper_cgi/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ readme = "README.md"
1212
futures = { workspace = true }
1313
tokio = { workspace = true }
1414
tokio-util = { workspace = true }
15-
hyper = { version = "0.14.27", features = ["stream", "tcp", "server", "http1"] }
15+
hyper = { version = "0.14.28", features = ["stream", "tcp", "server", "http1"] }
1616

17-
clap = { version = "4.4.6", optional = true }
18-
base64 = { version = "0.21.4", optional = true }
17+
clap = { version = "4.5.2", optional = true }
18+
base64 = { version = "0.21.7", optional = true }
1919
rand = { version = "0.8.5", optional = true, features = ["std"] }
2020
lazy_static = { version = "1.4.0", optional = true }
2121
hyper-reverse-proxy = { workspace = true }

josh-core/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ edition = "2021"
1212
[dependencies]
1313
backtrace = "0.3.69"
1414
bitvec = "1.0.1"
15-
git-version = "0.3.5"
15+
git-version = "0.3.9"
1616
git2 = { workspace = true }
1717
glob = "0.3.1"
18-
handlebars = "5.1.1"
18+
handlebars = "5.1.0"
1919
hex = "0.4.3"
2020
indoc = "2.0.4"
2121
itertools = "0.11.0"
2222
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"
23+
log = "0.4.21"
24+
percent-encoding = "2.3.1"
25+
pest = "2.7.8"
26+
pest_derive = "2.7.8"
27+
rayon = "1.9.0"
2828
regex = { workspace = true }
2929
rs_tracing = { workspace = true }
3030
serde = { workspace = true }
@@ -40,4 +40,4 @@ juniper = { workspace = true }
4040
[dependencies.chrono]
4141
default-features = false
4242
features = ["alloc", "std"]
43-
version = "0.4.31"
43+
version = "0.4.35"

josh-core/src/graphql.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ impl Revision {
147147

148148
let ts = filter_commit.time().seconds();
149149

150-
let ndt = chrono::NaiveDateTime::from_timestamp_opt(ts, 0)
151-
.ok_or(josh_error("from_timestamp_opt"))?;
150+
let ndt = chrono::DateTime::from_timestamp(ts, 0).ok_or(josh_error("from_timestamp"))?;
152151
Ok(ndt.format(&format).to_string())
153152
}
154153

josh-proxy/Cargo.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ repository = "https://github.com/josh-project/josh"
1010
version = "22.4.15"
1111

1212
[dependencies]
13-
base64 = "0.21.4"
13+
bytes = "1.5.0"
14+
base64 = "0.21.7"
1415
clap = { workspace = true }
1516
futures = { workspace = true }
16-
hyper = { version = "0.14.27", features = ["stream"] }
17+
hyper = { version = "0.14.28", features = ["stream"] }
1718
hyper-reverse-proxy = { workspace = true }
1819
hyper-staticfile = "0.9.5"
1920
hyper-tls = "0.5.0"
@@ -23,7 +24,7 @@ josh = {path = "../josh-core" }
2324
lazy_static = { workspace = true }
2425
opentelemetry = "0.20.0"
2526
opentelemetry-jaeger = "0.19.0"
26-
percent-encoding = "2.3.0"
27+
percent-encoding = "2.3.1"
2728
regex = { workspace = true }
2829
reqwest = { workspace = true }
2930
serde = { workspace = true }
@@ -36,8 +37,8 @@ tracing-futures = "0.2.5"
3637
tracing-opentelemetry = "0.21.0"
3738
tracing-subscriber = { workspace = true }
3839
unindent = "0.2.3"
39-
url = "2.4.1"
40-
uuid = { version = "1.4.1", features = ["v4"] }
40+
url = "2.5.0"
41+
uuid = { version = "1.7.0", features = ["v4"] }
4142
josh-rpc = { path = "../josh-rpc" }
4243
tokio-util = { workspace = true }
4344
tempdir = "0.3.7"

josh-ssh-shell/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ serde_json = { workspace = true }
1313
tracing = { workspace = true }
1414
tracing-subscriber = { workspace = true }
1515
tokio-util = { workspace = true }
16-
thiserror = "1.0.49"
17-
tempfile = "3.8.0"
16+
thiserror = "1.0.57"
17+
tempfile = "3.10.1"
1818
reqwest = { workspace = true }

josh-ui/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55

66
[build-dependencies]
77
npm_rs = "1.0.0"
8-
dircpy = "0.3.15"
8+
dircpy = "0.3.16"
99

1010
[lib]
1111
path = 'lib.rs'

0 commit comments

Comments
 (0)