Skip to content

Commit 4c07796

Browse files
authored
Merge pull request #32429 from def-/pr-axum-downgrade
build(deps): Downgrade axum-extra and axum
2 parents 59a017e + 75c4fbf commit 4c07796

File tree

22 files changed

+195
-198
lines changed

22 files changed

+195
-198
lines changed

Cargo.lock

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

deny.toml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ skip = [
9494
{ name = "hyper-timeout", version = "0.4.1" },
9595

9696
{ name = "tungstenite", version = "0.21.0" },
97+
{ name = "tungstenite", version = "0.24.0" },
98+
{ name = "tokio-tungstenite", version = "0.24.0" },
9799

98100
# `axum 0.7.5` depends on both `sync_wrapper 1.*` and `axum-core 0.4.3`.
99101
# The latter depends on `sync_wrapper 0.1.*`.
@@ -147,11 +149,6 @@ skip = [
147149
{ name = "windows_x86_64_gnu", version = "0.52.6" },
148150
{ name = "windows_x86_64_gnullvm", version = "0.52.6" },
149151
{ name = "windows_x86_64_msvc", version = "0.52.6" },
150-
# Used by axum-extra
151-
{ name = "axum-core", version = "0.4.5" },
152-
# Used by tonic
153-
{ name = "axum", version = "0.7.9" },
154-
{ name = "matchit", version = "0.7.0" },
155152
# Used by aws-config
156153
{ name = "aws-smithy-http", version = "0.60.10" },
157154
# Used by aws-sdk-s3

src/balancerd/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ workspace = true
1212
[dependencies]
1313
anyhow = "1.0.98"
1414
async-trait = "0.1.88"
15-
axum = "0.8.4"
15+
axum = "0.7.5"
1616
bytes = "1.10.1"
1717
bytesize = "1.3.0"
1818
chrono = { version = "0.4.39", default-features = false, features = ["std"] }

src/clusterd/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ workspace = true
1111

1212
[dependencies]
1313
anyhow = "1.0.98"
14-
axum = "0.8.4"
14+
axum = "0.7.5"
1515
clap = { version = "4.5.23", features = ["derive", "env"] }
1616
fail = { version = "0.5.1", features = ["failpoints"] }
1717
futures = "0.3.31"

src/environmentd/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ workspace = true
1515
anyhow = "1.0.98"
1616
askama = { version = "0.12.1", default-features = false, features = ["config", "serde-json"] }
1717
async-trait = "0.1.88"
18-
axum = { version = "0.8.4", features = ["ws"] }
19-
axum-extra = { version = "0.10.1", features = ["typed-header"] }
18+
axum = { version = "0.7.5", features = ["ws"] }
19+
axum-extra = { version = "0.9.3", features = ["typed-header"] }
2020
base64 = "0.22.1"
2121
bytes = "1.10.1"
2222
bytesize = "1.3.0"

0 commit comments

Comments
 (0)