matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-29 22:01:14 +03:00
Code Activity

Rust dependencies housekeeping

Browse Source 
Including:
 - package upgrades
 - stop using the patched version of `ulid`
 - update cargo deny duplicate exception list
This commit is contained in:
Quentin Gliech
2023-09-14 23:29:27 +02:00
parent e9856f8691
commit c9155ef0cf
18 changed files with 282 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

460
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

13
Cargo.toml
View File

@ -38,7 +38,7 @@ features = ["derive"] # Most of the time, if we need serde, we need derive
# JSON serialization and deserialization
[workspace.dependencies.serde_json]
version = "1.0.106"
version = "1.0.107"
# Custom error types
[workspace.dependencies.thiserror]
@ -53,6 +53,11 @@ version = "0.1.37"
version = "2.4.1"
features = ["serde"]
# ULID support
[workspace.dependencies.ulid]
version = "1.1.0"
features = ["serde"]
# A few profile opt-level tweaks to make the test suite run faster
[profile.dev.package]
num-bigint-dig.opt-level = 3
@ -66,9 +71,3 @@ sha2.opt-level = 3
digest.opt-level = 3
block-buffer.opt-level = 3
generic-array.opt-level = 3
# Until https://github.com/dylanhart/ulid-rs/pull/56 gets released
[patch.crates-io.ulid]
git = "https://github.com/dylanhart/ulid-rs.git"
rev = "0b9295c2db2114cd87aa19abcc1fc00c16b272db"

6
crates/axum-utils/Cargo.toml
View File

@ -14,12 +14,12 @@ axum-extra = { version = "0.7.7", features = ["cookie-private", "cookie-key-expa
chrono.workspace = true
data-encoding = "2.4.0"
futures-util = "0.3.28"
headers = "0.3.8"
headers = "0.3.9"
http.workspace = true
http-body = "0.4.5"
mime = "0.3.17"
rand.workspace = true
sentry = { version = "0.31.6", default-features = false }
sentry = { version = "0.31.7", default-features = false }
serde.workspace = true
serde_with = "3.3.0"
serde_urlencoded = "0.7.1"
@ -29,7 +29,7 @@ tokio = "1.32.0"
tower = { version = "0.4.13", features = ["util"] }
tracing.workspace = true
url.workspace = true
ulid = { version = "1.0.0", features = ["serde"] }
ulid.workspace = true
mas-data-model = { path = "../data-model" }
mas-http = { path = "../http", features = ["client"] }

6
crates/cli/Cargo.toml
View File

@ -42,9 +42,9 @@ opentelemetry-semantic-conventions = "0.12.0"
opentelemetry-stdout = { version = "0.1.0", features = ["trace", "metrics"] }
opentelemetry-zipkin = { version = "0.18.0", default-features = false }
prometheus = "0.13.3"
sentry = { version = "0.31.6", default-features = false, features = ["backtrace", "contexts", "panic", "tower"] }
sentry-tracing = "0.31.5"
sentry-tower = { version = "0.31.5", features = ["http"] }
sentry = { version = "0.31.7", default-features = false, features = ["backtrace", "contexts", "panic", "tower"] }
sentry-tracing = "0.31.7"
sentry-tower = { version = "0.31.7", features = ["http"] }
mas-config = { path = "../config" }
mas-data-model = { path = "../data-model" }

2
crates/config/Cargo.toml
View File

@ -19,7 +19,7 @@ camino = { version = "1.1.6", features = ["serde1"] }
chrono.workspace = true
figment = { version = "0.10.10", features = ["env", "yaml", "test"] }
schemars = { version = "0.8.13", features = ["url", "chrono"] }
ulid = { version = "1.0.0", features = ["serde"] }
ulid.workspace = true
url.workspace = true
serde.workspace = true

2
crates/data-model/Cargo.toml
View File

@ -13,7 +13,7 @@ thiserror.workspace = true
serde.workspace = true
url.workspace = true
crc = "3.0.1"
ulid = { version = "1.0.0", features = ["serde"] }
ulid.workspace = true
rand.workspace = true
rand_chacha = "0.3.1"

2
crates/email/Cargo.toml
View File

@ -11,7 +11,7 @@ repository.workspace = true
async-trait = "0.1.73"
tracing.workspace = true
thiserror.workspace = true
headers = "0.3.8"
headers = "0.3.9"
mas-templates = { path = "../templates" }

2
crates/graphql/Cargo.toml
View File

@ -18,7 +18,7 @@ thiserror.workspace = true
tokio = { version = "1.32.0", features = ["sync"] }
tracing.workspace = true
tower = { version = "0.4.13", features = ["util"] }
ulid = "1.0.0"
ulid.workspace = true
url.workspace = true
oauth2-types = { path = "../oauth2-types" }

6
crates/handlers/Cargo.toml
View File

@ -20,7 +20,7 @@ opentelemetry-semantic-conventions = "0.12.0"
# Error management
thiserror.workspace = true
anyhow.workspace = true
sentry = { version = "0.31.6", default-features = false }
sentry = { version = "0.31.7", default-features = false }
# Web server
hyper = { version = "0.14.27", features = ["full"] }
@ -58,8 +58,8 @@ url.workspace = true
mime = "0.3.17"
rand.workspace = true
rand_chacha = "0.3.1"
headers = "0.3.8"
ulid = "1.0.0"
headers = "0.3.9"
ulid.workspace = true
mas-axum-utils = { path = "../axum-utils", default-features = false }
mas-data-model = { path = "../data-model" }

2
crates/http/Cargo.toml
View File

@ -11,7 +11,7 @@ repository.workspace = true
axum = { version = "0.6.20", optional = true }
bytes = "1.5.0"
futures-util = "0.3.28"
headers = "0.3.8"
headers = "0.3.9"
http.workspace = true
http-body = "0.4.5"
hyper = "0.14.27"

4
crates/oidc-client/Cargo.toml
View File

@ -26,7 +26,7 @@ chrono.workspace = true
form_urlencoded = "1.2.0"
futures = "0.3.28"
futures-util = "0.3.28"
headers = "0.3.8"
headers = "0.3.9"
http.workspace = true
language-tags = "0.3.2"
once_cell = "1.18.0"
@ -67,7 +67,7 @@ optional = true
[dev-dependencies]
assert_matches = "1.5.0"
bitflags = "2.3.3"
bitflags = "2.4.0"
mas-keystore = { path = "../keystore" }
rand_chacha = "0.3.1"
wiremock = "0.5.19"

2
crates/policy/Cargo.toml
View File

@ -12,7 +12,7 @@ anyhow.workspace = true
opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" }
serde.workspace = true
serde_json.workspace = true
schemars = {version = "0.8.1", optional = true }
schemars = {version = "0.8.13", optional = true }
thiserror.workspace = true
tokio = { version = "1.32.0", features = ["io-util", "rt"] }
tracing.workspace = true

2
crates/router/Cargo.toml
View File

@ -12,4 +12,4 @@ axum = { version = "0.6.20", default-features = false }
serde.workspace = true
serde_urlencoded = "0.7.1"
url.workspace = true
ulid = "1.0.0"
ulid.workspace = true

2
crates/storage-pg/Cargo.toml
View File

@ -23,7 +23,7 @@ rand.workspace = true
rand_chacha = "0.3.1"
url.workspace = true
uuid = "1.4.1"
ulid = { version = "1.0.0", features = ["uuid", "serde"] }
ulid = { workspace = true, features = ["uuid"] }
oauth2-types = { path = "../oauth2-types" }
mas-storage = { path = "../storage" }

2
crates/storage/Cargo.toml
View File

@ -21,7 +21,7 @@ serde_json.workspace = true
tracing.workspace = true
tracing-opentelemetry = "0.21.0"
url.workspace = true
ulid = "1.0.0"
ulid.workspace = true
oauth2-types = { path = "../oauth2-types" }
mas-data-model = { path = "../data-model" }

2
crates/tasks/Cargo.toml
View File

@ -25,7 +25,7 @@ tower = "0.4.13"
tracing.workspace = true
tracing-opentelemetry = "0.21.0"
opentelemetry = "0.20.0"
ulid = "1.0.0"
ulid.workspace = true
url.workspace = true
serde.workspace = true
serde_json.workspace = true

2
crates/templates/Cargo.toml
View File

@ -23,7 +23,7 @@ camino = "1.1.6"
chrono.workspace = true
url.workspace = true
http.workspace = true
ulid = { version = "1.0.0", features = ["serde"] }
ulid.workspace = true
rand.workspace = true
oauth2-types = { path = "../oauth2-types" }

11
deny.toml
View File

@ -53,7 +53,7 @@ deny = [
]
# We try to avoid duplicating crates and track exceptions here
multiple-versions = "warn"
multiple-versions = "deny"
skip = [
{ name = "webpki-roots" }, # We, lettre and sqlx have different versions :(
@ -61,9 +61,13 @@ skip = [
{ name = "syn", version = "1.0.109" }, # There are a few crates still depdending on the 1.x
{ name = "spin", version = "0.5.2" }, # lazy_static and ring depends on the old version
{ name = "socket2", version = "0.4.9" }, # hyper depends on the old version
{ name = "event-listener", version = "2.5.3" }, # async-channel (wiremock) and sqlx-core depend on the old version
{ name = "regex-syntax", version = "0.6.29" }, # tracing-subscriber[env-filter] -> matchers depends on the old version
{ name = "regex-automata", version = "0.1.10" }, # ^
{ name = "ordered-float", version = "2.10.0" }, # opentelemetry-jaeger -> thrift depends on the old version
{ name = "addr2line", version = "0.20.0" }, # wasmtime depends on the old version
{ name = "gimli", version = "0.27.3" }, # wasmtime depends on the old version
{ name = "object", version = "0.31.1" }, # wasmtime depends on the old version
{ name = "rustix", version = "0.37.23" }, # wasmtime depends on the old version
{ name = "itertools", version = "0.10.5" }, # wasmtime & others depends on the old version
{ name = "idna", version = "0.3.0" }, # lettre depends on an old version
@ -86,10 +90,7 @@ deny = ["oldtime"]
unknown-registry = "warn"
unknown-git = "warn"
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
allow-git = [
# We depend on an unrelease version
"https://github.com/dylanhart/ulid-rs",
]
allow-git = []
[sources.allow-org]
# Allow our own crates