Skip to content

Commit 33fc456

Browse files
committed
Update most Rust dependencies & disable some unused features
1 parent 8a9cb68 commit 33fc456

File tree

8 files changed

+386
-366
lines changed

8 files changed

+386
-366
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ features = ["axum", "axum-extra", "axum-json", "axum-query", "macros"]
6464
# GraphQL server
6565
[workspace.dependencies.async-graphql]
6666
version = "7.0.15"
67-
features = ["chrono", "url", "tracing"]
67+
default-features = false
68+
features = ["chrono", "url", "tracing", "playground"]
6869

6970
[workspace.dependencies.async-stream]
7071
version = "0.3.6"
@@ -115,7 +116,7 @@ features = ["derive"]
115116

116117
# Cron expressions
117118
[workspace.dependencies.cron]
118-
version = "0.13.0"
119+
version = "0.15.0"
119120

120121
# Elliptic curve cryptography
121122
[workspace.dependencies.elliptic-curve]
@@ -133,7 +134,7 @@ version = "0.3.31"
133134

134135
# Rate-limiting
135136
[workspace.dependencies.governor]
136-
version = "0.7.0"
137+
version = "0.8.0"
137138

138139
# HTTP headers
139140
[workspace.dependencies.headers]
@@ -258,7 +259,7 @@ version = "0.23.22"
258259

259260
# Use platform-specific verifier for TLS
260261
[workspace.dependencies.rustls-platform-verifier]
261-
version = "0.3.4"
262+
version = "0.5.0"
262263

263264
# JSON Schema generation
264265
[workspace.dependencies.schemars]

crates/axum-utils/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ publish = false
1212
workspace = true
1313

1414
[dependencies]
15-
async-trait.workspace = true
1615
axum.workspace = true
1716
axum-extra.workspace = true
1817
chrono.workspace = true

crates/cli/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ bytes.workspace = true
2020
camino.workspace = true
2121
clap.workspace = true
2222
console = "0.15.10"
23-
dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }
23+
dialoguer = { version = "0.11.0", default-features = false, features = ["fuzzy-select", "password"] }
2424
dotenvy = "0.15.7"
2525
figment.workspace = true
2626
futures-util.workspace = true
@@ -39,7 +39,6 @@ serde_yaml = "0.9.34"
3939
sqlx.workspace = true
4040
tokio.workspace = true
4141
tokio-util.workspace = true
42-
tokio-stream.workspace = true
4342
tower.workspace = true
4443
tower-http.workspace = true
4544
url.workspace = true
@@ -81,7 +80,6 @@ mas-tasks.workspace = true
8180
mas-templates.workspace = true
8281
mas-tower.workspace = true
8382

84-
oauth2-types.workspace = true
8583
syn2mas.workspace = true
8684

8785
[build-dependencies]

crates/data-model/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ url.workspace = true
2121
crc = "3.2.1"
2222
ulid.workspace = true
2323
rand.workspace = true
24-
rand_chacha = "0.3.1"
2524
regex = "1.11.1"
2625
woothee = "0.13.0"
2726
ruma-common.workspace = true

crates/handlers/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ serde_urlencoded = "0.7.1"
5858

5959
# Password hashing
6060
argon2 = { version = "0.5.3", features = ["password-hash", "std"] }
61-
bcrypt = "0.16.0"
61+
bcrypt = { version = "0.16.0", default-features = true }
6262
pbkdf2 = { version = "0.12.2", features = [
6363
"password-hash",
6464
"std",
@@ -107,6 +107,8 @@ zxcvbn = "3.1.0"
107107
[dev-dependencies]
108108
insta.workspace = true
109109
tracing-subscriber.workspace = true
110-
cookie_store = { version = "0.21.1", default-features = false, features = ["serde_json"] }
110+
cookie_store = { version = "0.21.1", default-features = false, features = [
111+
"serde_json",
112+
] }
111113
sqlx.workspace = true
112114
wiremock.workspace = true

crates/http/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ opentelemetry-http.workspace = true
2020
opentelemetry-semantic-conventions.workspace = true
2121
opentelemetry.workspace = true
2222
reqwest.workspace = true
23+
rustls.workspace = true
2324
rustls-platform-verifier.workspace = true
2425
tokio.workspace = true
2526
tower.workspace = true

crates/http/src/reqwest.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ use opentelemetry_semantic_conventions::{
3030
NETWORK_TYPE, SERVER_ADDRESS, SERVER_PORT, URL_FULL, URL_SCHEME, USER_AGENT_ORIGINAL,
3131
},
3232
};
33+
use rustls_platform_verifier::ConfigVerifierExt;
3334
use tokio::time::Instant;
3435
use tower::{BoxError, Service as _};
3536
use tracing::Instrument;
@@ -91,9 +92,10 @@ impl reqwest::dns::Resolve for TracingResolver {
9192
#[must_use]
9293
pub fn client() -> reqwest::Client {
9394
// TODO: can/should we limit in-flight requests?
95+
let tls_config = rustls::ClientConfig::with_platform_verifier();
9496
reqwest::Client::builder()
9597
.dns_resolver(Arc::new(TracingResolver::new()))
96-
.use_preconfigured_tls(rustls_platform_verifier::tls_config())
98+
.use_preconfigured_tls(tls_config)
9799
.user_agent(USER_AGENT)
98100
.timeout(Duration::from_secs(60))
99101
.connect_timeout(Duration::from_secs(30))

0 commit comments

Comments
 (0)