magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump dependencies

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-03-31 05:03:15 +00:00
parent 5768ca8442
commit bee1f89624
4 changed files with 121 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

136
Cargo.lock generated
View file

@ -731,8 +731,8 @@ dependencies = [
"opentelemetry-jaeger", "opentelemetry-jaeger",
"opentelemetry_sdk", "opentelemetry_sdk",
"sentry", "sentry",
"sentry-tower", "sentry-tower 0.35.0",
"sentry-tracing", "sentry-tracing 0.35.0",
"tokio", "tokio",
"tokio-metrics", "tokio-metrics",
"tracing", "tracing",
@ -782,7 +782,7 @@ dependencies = [
"http-body-util", "http-body-util",
"hyper", "hyper",
"ipaddress", "ipaddress",
"itertools 0.13.0", "itertools 0.14.0",
"log", "log",
"rand 0.8.5", "rand 0.8.5",
"reqwest", "reqwest",
@ -802,6 +802,7 @@ dependencies = [
"argon2", "argon2",
"arrayvec", "arrayvec",
"axum", "axum",
"axum-extra",
"bytes", "bytes",
"bytesize", "bytesize",
"cargo_toml", "cargo_toml",
@ -820,7 +821,7 @@ dependencies = [
"http", "http",
"http-body-util", "http-body-util",
"ipaddress", "ipaddress",
"itertools 0.13.0", "itertools 0.14.0",
"libc", "libc",
"libloading", "libloading",
"log", "log",
@ -874,7 +875,7 @@ dependencies = [
name = "conduwuit_macros" name = "conduwuit_macros"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"itertools 0.13.0", "itertools 0.14.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn",
@ -904,8 +905,8 @@ dependencies = [
"rustls", "rustls",
"sd-notify", "sd-notify",
"sentry", "sentry",
"sentry-tower", "sentry-tower 0.35.0",
"sentry-tracing", "sentry-tracing 0.35.0",
"serde_json", "serde_json",
"tokio", "tokio",
"tower 0.5.2", "tower 0.5.2",
@ -930,7 +931,7 @@ dependencies = [
"http", "http",
"image", "image",
"ipaddress", "ipaddress",
"itertools 0.13.0", "itertools 0.14.0",
"log", "log",
"loole", "loole",
"lru-cache", "lru-cache",
@ -997,9 +998,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
[[package]] [[package]]
name = "const-str" name = "const-str"
version = "0.5.7" version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3618cccc083bb987a415d85c02ca6c9994ea5b44731ec28b9ecf09658655fba9" checksum = "9e991226a70654b49d34de5ed064885f0bef0348a8e70018b8ff1ac80aa984a2"
[[package]] [[package]]
name = "const_panic" name = "const_panic"
@ -1948,9 +1949,9 @@ dependencies = [
[[package]] [[package]]
name = "hyper-util" name = "hyper-util"
version = "0.1.8" version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures-channel", "futures-channel",
@ -1961,7 +1962,6 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
"socket2", "socket2",
"tokio", "tokio",
"tower 0.4.13",
"tower-service", "tower-service",
"tracing", "tracing",
] ]
@ -2543,18 +2543,18 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]] [[package]]
name = "minicbor" name = "minicbor"
version = "0.25.1" version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0452a60c1863c1f50b5f77cd295e8d2786849f35883f0b9e18e7e6e1b5691b0" checksum = "1936e27fffe7d8557c060eb82cb71668608cd1a5fb56b63e66d22ae8d7564321"
dependencies = [ dependencies = [
"minicbor-derive", "minicbor-derive",
] ]
[[package]] [[package]]
name = "minicbor-derive" name = "minicbor-derive"
version = "0.15.3" version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd2209fff77f705b00c737016a48e73733d7fbccb8b007194db148f03561fb70" checksum = "a9882ef5c56df184b8ffc107fc6c61e33ee3a654b021961d790a78571bb9d67a"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2563,9 +2563,9 @@ dependencies = [
[[package]] [[package]]
name = "minicbor-serde" name = "minicbor-serde"
version = "0.3.2" version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "becf18ac384ecf6f53b2db3b1549eebff664c67ecf259ae99be5912193291686" checksum = "54e45e8beeefea1b8b6f52fa188a5b6ea3746c2885606af8d4d8bf31cee633fb"
dependencies = [ dependencies = [
"minicbor", "minicbor",
"serde", "serde",
@ -3938,21 +3938,21 @@ checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
[[package]] [[package]]
name = "sentry" name = "sentry"
version = "0.35.0" version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "016958f51b96861dead7c1e02290f138411d05e94fad175c8636a835dee6e51e" checksum = "3a7332159e544e34db06b251b1eda5e546bd90285c3f58d9c8ff8450b484e0da"
dependencies = [ dependencies = [
"httpdate", "httpdate",
"reqwest", "reqwest",
"rustls", "rustls",
"sentry-backtrace", "sentry-backtrace",
"sentry-contexts", "sentry-contexts",
"sentry-core", "sentry-core 0.36.0",
"sentry-debug-images", "sentry-debug-images",
"sentry-log", "sentry-log",
"sentry-panic", "sentry-panic",
"sentry-tower", "sentry-tower 0.36.0",
"sentry-tracing", "sentry-tracing 0.36.0",
"tokio", "tokio",
"ureq", "ureq",
"webpki-roots", "webpki-roots",
@ -3960,27 +3960,27 @@ dependencies = [
[[package]] [[package]]
name = "sentry-backtrace" name = "sentry-backtrace"
version = "0.35.0" version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e57712c24e99252ef175b4b06c485294f10ad6bc5b5e1567ff3803ee7a0b7d3f" checksum = "565ec31ad37bab8e6d9f289f34913ed8768347b133706192f10606dabd5c6bc4"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"once_cell", "once_cell",
"regex", "regex",
"sentry-core", "sentry-core 0.36.0",
] ]
[[package]] [[package]]
name = "sentry-contexts" name = "sentry-contexts"
version = "0.35.0" version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eba8754ec3b9279e00aa6d64916f211d44202370a1699afde1db2c16cbada089" checksum = "e860275f25f27e8c0c7726ce116c7d5c928c5bba2ee73306e52b20a752298ea6"
dependencies = [ dependencies = [
"hostname", "hostname",
"libc", "libc",
"os_info", "os_info",
"rustc_version", "rustc_version",
"sentry-core", "sentry-core 0.36.0",
"uname", "uname",
] ]
@ -3992,40 +3992,53 @@ checksum = "f9f8b6dcd4fbae1e3e22b447f32670360b27e31b62ab040f7fb04e0f80c04d92"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"rand 0.8.5", "rand 0.8.5",
"sentry-types", "sentry-types 0.35.0",
"serde",
"serde_json",
]
[[package]]
name = "sentry-core"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "653942e6141f16651273159f4b8b1eaeedf37a7554c00cd798953e64b8a9bf72"
dependencies = [
"once_cell",
"rand 0.8.5",
"sentry-types 0.36.0",
"serde", "serde",
"serde_json", "serde_json",
] ]
[[package]] [[package]]
name = "sentry-debug-images" name = "sentry-debug-images"
version = "0.35.0" version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8982a69133d3f5e4efdbfa0776937fca43c3a2e275a8fe184f50b1b0aa92e07c" checksum = "2a60bc2154e6df59beed0ac13d58f8dfaf5ad20a88548a53e29e4d92e8e835c2"
dependencies = [ dependencies = [
"findshlibs", "findshlibs",
"once_cell", "once_cell",
"sentry-core", "sentry-core 0.36.0",
] ]
[[package]] [[package]]
name = "sentry-log" name = "sentry-log"
version = "0.35.0" version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efcbfbb74628eaef033c1154d4bb082437c7592ce2282c7c5ccb455c4c97a06d" checksum = "1c96d796cba1b3a0793e7f53edc420c61f9419fba8fb34ad5519f5c7d01af6b2"
dependencies = [ dependencies = [
"log", "log",
"sentry-core", "sentry-core 0.36.0",
] ]
[[package]] [[package]]
name = "sentry-panic" name = "sentry-panic"
version = "0.35.0" version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de296dae6f01e931b65071ee5fe28d66a27909857f744018f107ed15fd1f6b25" checksum = "105e3a956c8aa9dab1e4087b1657b03271bfc49d838c6ae9bfc7c58c802fd0ef"
dependencies = [ dependencies = [
"sentry-backtrace", "sentry-backtrace",
"sentry-core", "sentry-core 0.36.0",
] ]
[[package]] [[package]]
@ -4033,10 +4046,21 @@ name = "sentry-tower"
version = "0.35.0" version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcdaf9b1939589476bd57751d12a9653bbfe356610fc476d03d7683189183ab7" checksum = "fcdaf9b1939589476bd57751d12a9653bbfe356610fc476d03d7683189183ab7"
dependencies = [
"sentry-core 0.35.0",
"tower-layer",
"tower-service",
]
[[package]]
name = "sentry-tower"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "082f781dfc504d984e16d99f8dbf94d6ee4762dd0fc28de25713d0f900a8164d"
dependencies = [ dependencies = [
"http", "http",
"pin-project", "pin-project",
"sentry-core", "sentry-core 0.36.0",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"url", "url",
@ -4047,9 +4071,20 @@ name = "sentry-tracing"
version = "0.35.0" version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "263f73c757ed7915d3e1e34625eae18cad498a95b4261603d4ce3f87b159a6f0" checksum = "263f73c757ed7915d3e1e34625eae18cad498a95b4261603d4ce3f87b159a6f0"
dependencies = [
"sentry-core 0.35.0",
"tracing-core",
"tracing-subscriber",
]
[[package]]
name = "sentry-tracing"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64e75c831b4d8b34a5aec1f65f67c5d46a26c7c5d3c7abd8b5ef430796900cf8"
dependencies = [ dependencies = [
"sentry-backtrace", "sentry-backtrace",
"sentry-core", "sentry-core 0.36.0",
"tracing-core", "tracing-core",
"tracing-subscriber", "tracing-subscriber",
] ]
@ -4071,6 +4106,23 @@ dependencies = [
"uuid", "uuid",
] ]
[[package]]
name = "sentry-types"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d4203359e60724aa05cf2385aaf5d4f147e837185d7dd2b9ccf1ee77f4420c8"
dependencies = [
"debugid",
"hex",
"rand 0.8.5",
"serde",
"serde_json",
"thiserror 1.0.69",
"time",
"url",
"uuid",
]
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.219" version = "1.0.219"

48
Cargo.toml
View file

@ -27,11 +27,11 @@ version = "0.5.0"
name = "conduwuit" name = "conduwuit"
[workspace.dependencies.arrayvec] [workspace.dependencies.arrayvec]
version = "0.7.4" version = "0.7.6"
features = ["serde"] features = ["serde"]
[workspace.dependencies.smallvec] [workspace.dependencies.smallvec]
version = "1.13.2" version = "1.14.0"
features = [ features = [
"const_generics", "const_generics",
"const_new", "const_new",
@ -45,7 +45,7 @@ version = "0.3"
features = ["ffi", "std", "union"] features = ["ffi", "std", "union"]
[workspace.dependencies.const-str] [workspace.dependencies.const-str]
version = "0.5.7" version = "0.6.2"
[workspace.dependencies.ctor] [workspace.dependencies.ctor]
version = "0.2.9" version = "0.2.9"
@ -81,13 +81,13 @@ version = "0.8.5"
# Used for the http request / response body type for Ruma endpoints used with reqwest # Used for the http request / response body type for Ruma endpoints used with reqwest
[workspace.dependencies.bytes] [workspace.dependencies.bytes]
version = "1.9.0" version = "1.10.1"
[workspace.dependencies.http-body-util] [workspace.dependencies.http-body-util]
version = "0.1.2" version = "0.1.3"
[workspace.dependencies.http] [workspace.dependencies.http]
version = "1.2.0" version = "1.3.1"
[workspace.dependencies.regex] [workspace.dependencies.regex]
version = "1.11.1" version = "1.11.1"
@ -111,7 +111,7 @@ default-features = false
features = ["typed-header", "tracing"] features = ["typed-header", "tracing"]
[workspace.dependencies.axum-server] [workspace.dependencies.axum-server]
version = "0.7.1" version = "0.7.2"
default-features = false default-features = false
# to listen on both HTTP and HTTPS if listening on TLS dierctly from conduwuit for complement or sytest # to listen on both HTTP and HTTPS if listening on TLS dierctly from conduwuit for complement or sytest
@ -122,7 +122,7 @@ version = "0.7"
version = "0.6.1" version = "0.6.1"
[workspace.dependencies.tower] [workspace.dependencies.tower]
version = "0.5.1" version = "0.5.2"
default-features = false default-features = false
features = ["util"] features = ["util"]
@ -156,12 +156,12 @@ features = [
] ]
[workspace.dependencies.serde] [workspace.dependencies.serde]
version = "1.0.216" version = "1.0.219"
default-features = false default-features = false
features = ["rc"] features = ["rc"]
[workspace.dependencies.serde_json] [workspace.dependencies.serde_json]
version = "1.0.133" version = "1.0.140"
default-features = false default-features = false
features = ["raw_value"] features = ["raw_value"]
@ -237,7 +237,7 @@ features = [
] ]
[workspace.dependencies.futures] [workspace.dependencies.futures]
version = "0.3.30" version = "0.3.31"
default-features = false default-features = false
features = ["std", "async-await"] features = ["std", "async-await"]
@ -275,7 +275,7 @@ features = ["alloc", "std"]
default-features = false default-features = false
[workspace.dependencies.hyper] [workspace.dependencies.hyper]
version = "1.5.1" version = "1.6.0"
default-features = false default-features = false
features = [ features = [
"server", "server",
@ -285,7 +285,7 @@ features = [
[workspace.dependencies.hyper-util] [workspace.dependencies.hyper-util]
# hyper-util >=0.1.9 seems to have DNS issues # hyper-util >=0.1.9 seems to have DNS issues
version = "=0.1.8" version = "0.1.10"
default-features = false default-features = false
features = [ features = [
"server-auto", "server-auto",
@ -295,7 +295,7 @@ features = [
# to support multiple variations of setting a config option # to support multiple variations of setting a config option
[workspace.dependencies.either] [workspace.dependencies.either]
version = "1.13.0" version = "1.15.0"
default-features = false default-features = false
features = ["serde"] features = ["serde"]
@ -311,7 +311,7 @@ default-features = false
# Used for conduwuit::Error type # Used for conduwuit::Error type
[workspace.dependencies.thiserror] [workspace.dependencies.thiserror]
version = "2.0.7" version = "2.0.12"
default-features = false default-features = false
# Used when hashing the state # Used when hashing the state
@ -321,7 +321,7 @@ default-features = false
# Used to make working with iterators easier, was already a transitive depdendency # Used to make working with iterators easier, was already a transitive depdendency
[workspace.dependencies.itertools] [workspace.dependencies.itertools]
version = "0.13.0" version = "0.14.0"
# to parse user-friendly time durations in admin commands # to parse user-friendly time durations in admin commands
#TODO: overlaps chrono? #TODO: overlaps chrono?
@ -337,7 +337,7 @@ version = "0.4.0"
version = "2.3.1" version = "2.3.1"
[workspace.dependencies.async-trait] [workspace.dependencies.async-trait]
version = "0.1.83" version = "0.1.88"
[workspace.dependencies.lru-cache] [workspace.dependencies.lru-cache]
version = "0.1.2" version = "0.1.2"
@ -423,7 +423,7 @@ features = ["rt-tokio"]
# optional sentry metrics for crash/panic reporting # optional sentry metrics for crash/panic reporting
[workspace.dependencies.sentry] [workspace.dependencies.sentry]
version = "0.35.0" version = "0.36.0"
default-features = false default-features = false
features = [ features = [
"backtrace", "backtrace",
@ -499,18 +499,18 @@ default-features = false
version = "0.1" version = "0.1"
[workspace.dependencies.syn] [workspace.dependencies.syn]
version = "2.0.90" version = "2.0"
default-features = false default-features = false
features = ["full", "extra-traits"] features = ["full", "extra-traits"]
[workspace.dependencies.quote] [workspace.dependencies.quote]
version = "1.0.37" version = "1.0"
[workspace.dependencies.proc-macro2] [workspace.dependencies.proc-macro2]
version = "1.0.89" version = "1.0"
[workspace.dependencies.bytesize] [workspace.dependencies.bytesize]
version = "2.0.1" version = "2.0"
[workspace.dependencies.core_affinity] [workspace.dependencies.core_affinity]
version = "0.8.1" version = "0.8.1"
@ -522,11 +522,11 @@ version = "0.2"
version = "0.2" version = "0.2"
[workspace.dependencies.minicbor] [workspace.dependencies.minicbor]
version = "0.25.1" version = "0.26.3"
features = ["std"] features = ["std"]
[workspace.dependencies.minicbor-serde] [workspace.dependencies.minicbor-serde]
version = "0.3.2" version = "0.4.1"
features = ["std"] features = ["std"]
[workspace.dependencies.maplit] [workspace.dependencies.maplit]

1
src/core/Cargo.toml
View file

@ -59,6 +59,7 @@ conduwuit_mods = [
argon2.workspace = true argon2.workspace = true
arrayvec.workspace = true arrayvec.workspace = true
axum.workspace = true axum.workspace = true
axum-extra.workspace = true
bytes.workspace = true bytes.workspace = true
bytesize.workspace = true bytesize.workspace = true
cargo_toml.workspace = true cargo_toml.workspace = true

2
src/core/error/mod.rs
View file

@ -81,6 +81,8 @@ pub enum Error {
#[error("Tracing reload error: {0}")] #[error("Tracing reload error: {0}")]
TracingReload(#[from] tracing_subscriber::reload::Error), TracingReload(#[from] tracing_subscriber::reload::Error),
#[error(transparent)] #[error(transparent)]
TypedHeader(#[from] axum_extra::typed_header::TypedHeaderRejection),
#[error(transparent)]
Yaml(#[from] serde_yaml::Error), Yaml(#[from] serde_yaml::Error),
// ruma/conduwuit // ruma/conduwuit