Update Rust crate tokio to 1.44.2

2025-04-12 00:27:19 +00:00
12 changed files with 207 additions and 339 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -21,9 +21,9 @@ dependencies = [

 [[package]]
 name = "actix-http"
-version = "3.11.0"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44dfe5c9e0004c623edc65391dfd51daa201e7e30ebd9c9bedf873048ec32bc2"
+checksum = "0fa882656b67966045e4152c634051e70346939fced7117d5f0b52146a7c74c9"
 dependencies = [
 "actix-codec",
 "actix-rt",
@@ -34,7 +34,7 @@ dependencies = [
 "brotli",
 "bytes",
 "bytestring",
- "derive_more",
+ "derive_more 2.0.1",
 "encoding_rs",
 "flate2",
 "foldhash",
@@ -49,7 +49,7 @@ dependencies = [
 "mime",
 "percent-encoding",
 "pin-project-lite",
- "rand 0.9.2",
+ "rand 0.9.0",
 "sha1",
 "smallvec",
 "tokio",
@@ -106,9 +106,9 @@ dependencies = [

 [[package]]
 name = "actix-server"
-version = "2.6.0"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a65064ea4a457eaf07f2fba30b4c695bf43b721790e9530d26cb6f9019ff7502"
+checksum = "6398974fd4284f4768af07965701efbbb5fdc0616bff20cade1bb14b77675e24"
 dependencies = [
 "actix-rt",
 "actix-service",
@@ -116,7 +116,7 @@ dependencies = [
 "futures-core",
 "futures-util",
 "mio",
- "socket2 0.5.8",
+ "socket2",
 "tokio",
 "tracing",
 ]
@@ -133,16 +133,16 @@ dependencies = [

 [[package]]
 name = "actix-session"
-version = "0.11.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "400c27fd4cdbe0082b7bbd29ac44a3070cbda1b2114138dc106ba39fe2f90dff"
+checksum = "efe6976a74f34f1b6d07a6c05aadc0ed0359304a7781c367fa5b4029418db08f"
 dependencies = [
 "actix-service",
 "actix-utils",
 "actix-web",
 "anyhow",
- "derive_more",
- "rand 0.9.2",
+ "derive_more 1.0.0",
+ "rand 0.8.5",
 "redis",
 "serde",
 "serde_json",
@@ -161,9 +161,9 @@ dependencies = [

 [[package]]
 name = "actix-web"
-version = "4.11.0"
+version = "4.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a597b77b5c6d6a1e1097fddde329a83665e25c5437c696a3a9a4aa514a614dea"
+checksum = "f2e3b15b3dc6c6ed996e4032389e9849d4ab002b1e92fbfe85b5f307d1479b4d"
 dependencies = [
 "actix-codec",
 "actix-http",
@@ -178,7 +178,7 @@ dependencies = [
 "bytestring",
 "cfg-if",
 "cookie",
- "derive_more",
+ "derive_more 2.0.1",
 "encoding_rs",
 "foldhash",
 "futures-core",
@@ -196,7 +196,7 @@ dependencies = [
 "serde_json",
 "serde_urlencoded",
 "smallvec",
- "socket2 0.5.8",
+ "socket2",
 "time",
 "tracing",
 "url",
@@ -369,9 +369,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.99"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"

 [[package]]
 name = "arc-swap"
@@ -399,9 +399,9 @@ checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f"

 [[package]]
 name = "askama"
-version = "0.14.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
+checksum = "9a4e46abb203e00ef226442d452769233142bbfdd79c3941e84c8e61c4112543"
 dependencies = [
 "askama_derive",
 "itoa",
@@ -412,9 +412,9 @@ dependencies = [

 [[package]]
 name = "askama_derive"
-version = "0.14.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
+checksum = "54398906821fd32c728135f7b351f0c7494ab95ae421d41b6f5a020e158f28a6"
 dependencies = [
 "askama_parser",
 "basic-toml",
@@ -429,9 +429,9 @@ dependencies = [

 [[package]]
 name = "askama_parser"
-version = "0.14.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
+checksum = "cf315ce6524c857bb129ff794935cf6d42c82a6cff60526fe2a63593de4d0d4f"
 dependencies = [
 "memchr",
 "serde",
@@ -530,15 +530,6 @@ dependencies = [
 "thiserror 1.0.69",
 ]

-[[package]]
-name = "backon"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "592277618714fbcecda9a02ba7a8781f319d26532a88553bbacc77ba5d2b3a8d"
-dependencies = [
- "fastrand",
-]
-
 [[package]]
 name = "backtrace"
 version = "0.3.74"
@@ -560,12 +551,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"

-[[package]]
-name = "base16ct"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b59d472eab27ade8d770dcb11da7201c11234bef9f82ce7aa517be028d462b"
-
 [[package]]
 name = "base64"
 version = "0.20.0"
@@ -636,9 +621,9 @@ dependencies = [

 [[package]]
 name = "brotli"
-version = "8.0.1"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9991eea70ea4f293524138648e41ee89b0b2b12ddef3b255effa43c8056e0e0d"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
 dependencies = [
 "alloc-no-stdlib",
 "alloc-stdlib",
@@ -647,9 +632,9 @@ dependencies = [

 [[package]]
 name = "brotli-decompressor"
-version = "5.0.0"
+version = "4.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
+checksum = "74fa05ad7d803d413eb8380983b092cbbaf9a85f151b871360e7b00cd7060b37"
 dependencies = [
 "alloc-no-stdlib",
 "alloc-stdlib",
@@ -710,9 +695,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
@@ -734,9 +719,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.47"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
+checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -744,9 +729,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.47"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
+checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
 dependencies = [
 "anstream",
 "anstyle",
@@ -756,9 +741,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.5.47"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
 dependencies = [
 "heck",
 "proc-macro2",
@@ -943,9 +928,9 @@ dependencies = [

 [[package]]
 name = "crypto-common"
-version = "0.2.0-rc.3"
+version = "0.2.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a23fa214dea9efd4dacee5a5614646b30216ae0f05d4bb51bafb50e9da1c5be"
+checksum = "170d71b5b14dec99db7739f6fc7d6ec2db80b78c3acb77db48392ccc3d8a9ea0"
 dependencies = [
 "hybrid-array",
 ]
@@ -992,13 +977,34 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "derive_more"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+dependencies = [
+ "derive_more-impl 1.0.0",
+]
+
 [[package]]
 name = "derive_more"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
 dependencies = [
- "derive_more-impl",
+ "derive_more-impl 2.0.1",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "unicode-xid",
 ]

 [[package]]
@@ -1027,13 +1033,13 @@ dependencies = [

 [[package]]
 name = "digest"
-version = "0.11.0-rc.0"
+version = "0.11.0-pre.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "460dd7f37e4950526b54a5a6b1f41b6c8e763c58eb9a8fc8fc05ba5c2f44ca7b"
+checksum = "6c478574b20020306f98d61c8ca3322d762e1ff08117422ac6106438605ea516"
 dependencies = [
 "block-buffer 0.11.0-rc.4",
 "const-oid 0.10.0",
- "crypto-common 0.2.0-rc.3",
+ "crypto-common 0.2.0-rc.2",
 ]

 [[package]]
@@ -1086,7 +1092,7 @@ version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
- "base16ct 0.2.0",
+ "base16ct",
 "crypto-bigint",
 "digest 0.10.7",
 "ff",
@@ -1219,6 +1225,7 @@ checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
 "futures-channel",
 "futures-core",
+ "futures-executor",
 "futures-io",
 "futures-sink",
 "futures-task",
@@ -1241,6 +1248,17 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"

+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-io"
 version = "0.3.31"
@@ -1276,6 +1294,7 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
+ "futures-channel",
 "futures-core",
 "futures-io",
 "futures-macro",
@@ -1595,7 +1614,7 @@ dependencies = [
 "http-body",
 "hyper",
 "pin-project-lite",
- "socket2 0.5.8",
+ "socket2",
 "tokio",
 "tower-service",
 "tracing",
@@ -1789,17 +1808,6 @@ dependencies = [
 "generic-array",
 ]

-[[package]]
-name = "io-uring"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
-dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.11.0"
@@ -1904,7 +1912,7 @@ dependencies = [
 "serde",
 "serde_json",
 "superboring",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "zeroize",
 ]

@@ -1959,9 +1967,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.174"
+version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"

 [[package]]
 name = "libm"
@@ -2044,7 +2052,7 @@ dependencies = [
 "actix-ws",
 "anyhow",
 "askama",
- "base16ct 0.3.0",
+ "base16ct",
 "bytes",
 "chrono",
 "clap",
@@ -2056,14 +2064,14 @@ dependencies = [
 "light-openid",
 "log",
 "mime_guess",
- "rand 0.9.2",
+ "rand 0.9.0",
 "ruma",
 "rust-embed",
 "rust-s3",
 "serde",
 "serde_json",
- "sha2 0.11.0-rc.0",
- "thiserror 2.0.16",
+ "sha2 0.11.0-pre.5",
+ "thiserror 2.0.12",
 "tokio",
 "urlencoding",
 "uuid",
@@ -2355,6 +2363,26 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"

+[[package]]
+name = "pin-project"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.16"
@@ -2505,12 +2533,13 @@ dependencies = [

 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
 dependencies = [
 "rand_chacha 0.9.0",
 "rand_core 0.9.3",
+ "zerocopy",
 ]

 [[package]]
@@ -2553,24 +2582,23 @@ dependencies = [

 [[package]]
 name = "redis"
-version = "0.32.5"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd3650deebc68526b304898b192fa4102a4ef0b9ada24da096559cb60e0eef8"
+checksum = "e902a69d09078829137b4a5d9d082e0490393537badd7c91a3d69d14639e115f"
 dependencies = [
 "arc-swap",
- "backon",
+ "async-trait",
 "bytes",
- "cfg-if",
 "combine",
- "futures-channel",
+ "futures",
 "futures-util",
 "itoa",
 "num-bigint",
 "percent-encoding",
 "pin-project-lite",
 "ryu",
- "socket2 0.6.0",
 "tokio",
+ "tokio-retry",
 "tokio-util",
 "url",
 ]
@@ -2712,9 +2740,9 @@ dependencies = [

 [[package]]
 name = "ruma"
-version = "0.12.6"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3714d4ebd4314e6510bc64194fcdea1b51fe47898169a08f1bb4912e5c10e2c5"
+checksum = "c64fdaae631940eda62844a8a3026aba2ba84c22588c888ebec44861ba4d0c18"
 dependencies = [
 "assign",
 "js_int",
@@ -2750,9 +2778,9 @@ dependencies = [

 [[package]]
 name = "ruma-client-api"
-version = "0.20.4"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a9e9c613cfda4923b851c5d8bc442305905bee4f0c2b924564b00e71636c8d4"
+checksum = "b9a89ac03a0f4451f946ed9aed6fdd16ef5a78a3a2849e87af4b2474a176b2fb"
 dependencies = [
 "as_variant",
 "assign",
@@ -2767,16 +2795,16 @@ dependencies = [
 "serde",
 "serde_html_form",
 "serde_json",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "url",
 "web-time",
 ]

 [[package]]
 name = "ruma-common"
-version = "0.15.4"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "387e1898e868d32ff7b205e7db327361d5dcf635c00a8ae5865068607595a9cf"
+checksum = "6b75da013b362664c3e161662902e5da3f77e990525681b59c6035bac27e87b4"
 dependencies = [
 "as_variant",
 "base64 0.22.1",
@@ -2795,7 +2823,7 @@ dependencies = [
 "serde",
 "serde_html_form",
 "serde_json",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "time",
 "tracing",
 "url",
@@ -2806,9 +2834,9 @@ dependencies = [

 [[package]]
 name = "ruma-events"
-version = "0.30.5"
+version = "0.30.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f141b37dcd3cfa1199d6a13929db59be529b2c69107edc9f1702b81015e970b2"
+checksum = "6c100eb6c7691ef010f18d9af315f486fc4da621b7203c431e88352148e84551"
 dependencies = [
 "as_variant",
 "indexmap",
@@ -2821,7 +2849,7 @@ dependencies = [
 "ruma-macros",
 "serde",
 "serde_json",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "tracing",
 "url",
 "web-time",
@@ -2835,14 +2863,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ad674b5e5368c53a2c90fde7dac7e30747004aaf7b1827b72874a25fc06d4d8"
 dependencies = [
 "js_int",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 ]

 [[package]]
 name = "ruma-macros"
-version = "0.15.2"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ff13fbd6045a7278533390826de316d6116d8582ed828352661337b0c422e1c"
+checksum = "c1182e83ee5cd10121974f163337b16af68a93eedfc7cdbdbd52307ac7e1d743"
 dependencies = [
 "cfg-if",
 "proc-macro-crate",
@@ -2856,9 +2884,9 @@ dependencies = [

 [[package]]
 name = "rust-embed"
-version = "8.7.2"
+version = "8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025908b8682a26ba8d12f6f2d66b987584a4a87bc024abc5bbc12553a8cd178a"
+checksum = "0b3aba5104622db5c9fc61098de54708feb732e7763d7faa2fa625899f00bf6f"
 dependencies = [
 "rust-embed-impl",
 "rust-embed-utils",
@@ -2867,9 +2895,9 @@ dependencies = [

 [[package]]
 name = "rust-embed-impl"
-version = "8.7.2"
+version = "8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6065f1a4392b71819ec1ea1df1120673418bf386f50de1d6f54204d836d4349c"
+checksum = "1f198c73be048d2c5aa8e12f7960ad08443e56fd39cc26336719fdb4ea0ebaae"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2880,9 +2908,9 @@ dependencies = [

 [[package]]
 name = "rust-embed-utils"
-version = "8.7.2"
+version = "8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6cc0c81648b20b70c491ff8cce00c1c3b223bb8ed2b5d41f0e54c6c4c0a3594"
+checksum = "5a2fcdc9f40c8dc2922842ca9add611ad19f332227fc651d015881ad1552bd9a"
 dependencies = [
 "sha2 0.10.8",
 "walkdir",
@@ -3058,7 +3086,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
- "base16ct 0.2.0",
+ "base16ct",
 "der",
 "generic-array",
 "pkcs8",
@@ -3124,9 +3152,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.143"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
 "itoa",
 "memchr",
@@ -3179,13 +3207,13 @@ dependencies = [

 [[package]]
 name = "sha2"
-version = "0.11.0-rc.0"
+version = "0.11.0-pre.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa1d2e6b3cc4e43a8258a9a3b17aa5dfd2cc5186c7024bba8a64aa65b2c71a59"
+checksum = "19b4241d1a56954dce82cecda5c8e9c794eef6f53abe5e5216bac0a0ea71ffa7"
 dependencies = [
 "cfg-if",
 "cpufeatures",
- "digest 0.11.0-rc.0",
+ "digest 0.11.0-pre.10",
 ]

 [[package]]
@@ -3238,16 +3266,6 @@ dependencies = [
 "windows-sys 0.52.0",
 ]

-[[package]]
-name = "socket2"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -3378,11 +3396,11 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "2.0.16"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.16",
+ "thiserror-impl 2.0.12",
 ]

 [[package]]
@@ -3398,9 +3416,9 @@ dependencies = [

 [[package]]
 name = "thiserror-impl"
-version = "2.0.16"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3459,22 +3477,20 @@ dependencies = [

 [[package]]
 name = "tokio"
-version = "1.47.1"
+version = "1.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
+checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
 dependencies = [
 "backtrace",
 "bytes",
- "io-uring",
 "libc",
 "mio",
 "parking_lot",
 "pin-project-lite",
 "signal-hook-registry",
- "slab",
- "socket2 0.6.0",
+ "socket2",
 "tokio-macros",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -3498,6 +3514,17 @@ dependencies = [
 "tokio",
 ]

+[[package]]
+name = "tokio-retry"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
+dependencies = [
+ "pin-project",
+ "rand 0.8.5",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.26.2"
@@ -3730,14 +3757,12 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"

 [[package]]
 name = "uuid"
-version = "1.18.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f33196643e165781c20a5ead5582283a7dacbb87855d867fbc2df3f81eddc1be"
+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 dependencies = [
 "getrandom 0.3.1",
- "js-sys",
 "serde",
- "wasm-bindgen",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,32 +4,32 @@ version = "0.1.0"
 edition = "2021"

 [dependencies]
-log = "0.4.28"
+log = "0.4.27"
 env_logger = "0.11.8"
-clap = { version = "4.5.51", features = ["derive", "env"] }
+clap = { version = "4.5.35", features = ["derive", "env"] }
 lazy_static = "1.5.0"
-anyhow = "1.0.100"
-serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.145"
-rust-s3 = { version = "0.37.0", features = ["tokio"] }
-actix-web = "4.11.0"
-actix-session = { version = "0.11.0", features = ["redis-session"] }
+anyhow = "1.0.97"
+serde = { version = "1.0.219", features = ["derive"] }
+serde_json = "1.0.140"
+rust-s3 = { version = "0.36.0-beta.2", features = ["tokio"] }
+actix-web = "4.10.2"
+actix-session = { version = "0.10.1", features = ["redis-session"] }
 light-openid = "1.0.4"
-thiserror = "2.0.17"
-rand = "0.9.2"
-rust-embed = "8.9.0"
+thiserror = "2.0.11"
+rand = "0.9.0"
+rust-embed = "8.6.0"
 mime_guess = "2.0.5"
-askama = "0.14.0"
+askama = "0.13.0"
 urlencoding = "2.1.3"
-uuid = { version = "1.18.0", features = ["v4", "serde"] }
+uuid = { version = "1.12.1", features = ["v4", "serde"] }
 ipnet = { version = "2.11.0", features = ["serde"] }
-chrono = "0.4.42"
+chrono = "0.4.40"
 futures-util = { version = "0.3.31", features = ["sink"] }
-jwt-simple = { version = "0.12.13", default-features = false, features = ["pure-rust"] }
+jwt-simple = { version = "0.12.12", default-features = false, features = ["pure-rust"] }
 actix-remote-ip = "0.1.0"
 bytes = "1.10.1"
-sha2 = "0.11.0-rc.2"
-base16ct = { version = "0.3.0", features = ["alloc"] }
-ruma = { version = "0.13.0", features = ["client-api-c", "client-ext-client-api", "client-hyper-native-tls", "rand"] }
+sha2 = "0.11.0-pre.5"
+base16ct = "0.2.0"
+ruma = { version = "0.12.2", features = ["client-api-c", "client-ext-client-api", "client-hyper-native-tls", "rand"] }
 actix-ws = "0.3.0"
-tokio = { version = "1.48.0", features = ["rt", "time", "macros", "rt-multi-thread"] }
+tokio = { version = "1.44.2", features = ["rt", "time", "macros", "rt-multi-thread"] }
--- a/README.md
+++ b/README.md
@@ -18,20 +18,13 @@ docker run --rm -it docker.io/pierre42100/matrix_gateway --help

 ## Setup dev environment
 ```
-mkdir -p storage/maspostgres storage/synapse storage/minio
+mkdir -p storage/postgres storage/synapse storage/minio
 docker compose up
 ```

-To create default account, in another terminal, run the following command:
-
-```bash
-docker compose --profile create-accounts up -d
-```
-
 URLs:
 * Element: http://localhost:8080/
 * Synapse: http://localhost:8448/
-* Matrix Authentication Service: http://localhost:8778/
 * OpenID configuration: http://127.0.0.1:9001/dex/.well-known/openid-configuration
 * Minio console: http://localhost:9002/

--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,48 +1,15 @@
 services:
-  mas:
-    image: ghcr.io/element-hq/matrix-authentication-service:main
-    user: "1000"
-    restart: unless-stopped
-    depends_on:
-      - masdb
-    volumes:
-      - ./docker/mas:/config:ro
-    command: server -c /config/config.yaml
-    ports:
-      - "8778:8778/tcp"
-
-  mas_create_admin1:
-    image: ghcr.io/element-hq/matrix-authentication-service:main
-    user: "1000"
-    restart: no
-    profiles: ["create-accounts"]
-    depends_on:
-      - mas
-    volumes:
-      - ./docker/mas:/config:ro
-    command: |
-      manage register-user -c /config/config.yaml -y --ignore-password-complexity 
-      -p admin1 -e admin1@admin1.local --admin -d "Admin One" admin1
-
-  mas_create_user1:
-    image: ghcr.io/element-hq/matrix-authentication-service:main
-    user: "1000"
-    restart: no
-    profiles: ["create-accounts"]
-    depends_on:
-      - mas
-    volumes:
-      - ./docker/mas:/config:ro
-    command: |
-      manage register-user -c /config/config.yaml -y --ignore-password-complexity 
-      -p user1 -e user1@user1.local -d "User One" user1
-
  synapse:
    image: docker.io/matrixdotorg/synapse:latest
    user: "1000"
    # Since synapse does not retry to connect to the database, restart upon
    # failure
    restart: unless-stopped
+    entrypoint: /bin/bash
+    command: >
+      -c "nohup bash -c 'sleep 10; /config/delayed_accounts_creation.sh' \&
+        ./start.py"
+
    # See the readme for a full documentation of the environment settings
    # NOTE: You must edit homeserver.yaml to use postgres, it defaults to sqlite
    environment:
@@ -55,25 +22,25 @@ services:
      # - ./files:/data
      # - /path/to/ssd:/data/uploads
      # - /path/to/large_hdd:/data/media
+    depends_on:
+      - db
    # In order to expose Synapse, remove one of the following, you might for
    # instance expose the TLS port directly:
    ports:
-      - "8448:8448/tcp"
+      - 8448:8448/tcp

-  masdb:
-    image: docker.io/postgres:18-alpine
+  db:
+    image: docker.io/postgres:17-alpine
    user: "1000"
    environment:
-      - POSTGRES_DB=masdb
-      - POSTGRES_USER=masdb
+      - POSTGRES_USER=synapse
      - POSTGRES_PASSWORD=changeme
      # ensure the database gets created correctly
      # https://element-hq.github.io/synapse/latest/postgres.html#set-up-database
      - POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
-      - PGDATA=/data
    volumes:
      # You may store the database tables in a local folder..
-      - ./storage/maspostgres:/data
+      - ./storage/postgres:/var/lib/postgresql/data
      # .. or store them on some high performance storage for better results
      # - /path/to/ssd/storage:/var/lib/postgresql/data

--- a/docker/mas/config.yaml
+++ b/docker/mas/config.yaml
@@ -1,113 +0,0 @@
-http:
-  listeners:
-  - name: web
-    resources:
-    - name: discovery
-    - name: human
-    - name: oauth
-    - name: compat
-    - name: graphql
-    - name: assets
-    binds:
-    - address: '[::]:8778'
-    proxy_protocol: false
-  - name: internal
-    resources:
-    - name: health
-    binds:
-    - host: localhost
-      port: 8081
-    proxy_protocol: false
-  trusted_proxies:
-  - 192.168.0.0/16
-  - 172.16.0.0/12
-  - 10.0.0.0/10
-  - 127.0.0.1/8
-  - fd00::/8
-  - ::1/128
-  public_base: http://localhost:8778/
-  issuer: http://localhost:8778/
-database:
-  uri: postgresql://masdb:changeme@masdb/masdb
-  max_connections: 10
-  min_connections: 0
-  connect_timeout: 30
-  idle_timeout: 600
-  max_lifetime: 1800
-email:
-  from: '"Authentication Service" <root@localhost>'
-  reply_to: '"Authentication Service" <root@localhost>'
-  transport: blackhole
-secrets:
-  encryption: 12de9ad7bc2bacfa2ab9b1e3f7f1b3feb802195c8ebe66a8293cdb27f00be471
-  keys:
-  - kid: Bj2PICQ7mf
-    key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      MIIEogIBAAKCAQEAsCYCrrCJA7IuGbTYzP5yZN74QszbzudBUCX6MyN/+36HO2r6
-      xL8x1PRJ+Klx9Y90J9pWuo+cIuEmFLqO+Yfblo9fSQgZVvkWAFpO6Xh8J4z9qg49
-      M8xm0Ct8EnRDZDCEOBnwoDaAB9RTbpJGa1RPVCiamfi+xU+j47Zl4Er5jvLm81O7
-      DSlH9eK8Eih8AxuKTkAbKE1zyXquImE26Mj2dmMRfjDrWV/I8oqE3WFViAKR12Av
-      zw6TUyduiz8nK9pONCF3NIcQvBdHntBz1HlDXv6i0fRvlGIhjNL5LBgo6XQ3rNM1
-      bW2KYOw/iFP0YbfD4/xRjkBPvK2coQ8aRzK2VwIDAQABAoH/G4XU5Xav8ePlUB7x
-      wRYAycINCGL59Vos2lkUvujNFn6uopoUlKlLH/sLk87l/3hqrc9vvbayrsB/Mr3z
-      mQmhReUg/khFrVE+Hs/9hH1O6N8ew3N2HKHTbrNcr4V7AiySfDGRZ3ccihyi7KPu
-      XNbPjlbJ0UUMicfn06ysPl94nt0So0UAmXg+c7sDDqyzh3cY8emedYZ5FCljo/jA
-      F8k40rs7CywLJYMJB9O1vtomgt1xkDRO4F8UrZrriMIcYn0iFKe7i4AH8D6nkgNu
-      /v9Z43Leu8yRKrUvbpH3NaX8DlUSFWAXKpwUWr4sAQgWcLkVgjAXG1v9jCE97qW2
-      f0nBAoGBAOaKrnY5rWeZ74dERnPhSCsYiqRMneQAh7eJR+Er+xu1yF/bxwkhq2tK
-      /txheTK448DqhQRtr095t/v7TMZcPl3bSmybT1CQg/wiMJsgDMZqlC9tofvcq6uz
-      xP8vxMFHd0YSMSP693dkny4MzNY6LuoVWDLT+HxKPJyzGs1alruzAoGBAMOZp5J2
-      3ODcHQlcsGBtj1yVpQ4UXMvrSZF2ygiGK9bagL/f1iAtwACVOh5rgmbiOLSVgmR2
-      n4nupTgSAXMYkjmAmDyEh0PDaRl4WWvYEKp8GMvTPVPvjc6N0dT+y8Mf9bu+LcEt
-      +uZqPOZNbO5Vi+UgGeM9zZpxq/K7dpJmM/jNAoGBALsYHRGxKTsEwFEkZZCxaWIg
-      HpPL4e8hRwL6FC13BeitFBpHQDX27yi5yi+Lo1I4ngz3xk+bvERhYaDLhrkML0j4
-      KGQPfsTBI3vBO3UJA5Ua9XuwG19M7L0BvYPjfmfk2bUyGlM63w4zyMMUfD/3JA+w
-      ls1ZHTWxAZOh/sRdGirlAoGAX16B1+XgmDp6ZeAtlzaUGd5U1eKTxFF6U1SJ+VIB
-      +gYblHI84v+riB06cy6ULDnM0C+9neJAs24KXKZa0pV+Zk8O6yLrGN0kV2jYoL5+
-      kcFkDa13T3+TssxvLNz22LKyi9GUWYZjuQi/nMLPg/1t8k+Oj7/Iia822WkRzRvL
-      51kCgYEAwrN5Us8LR+fThm3C0vhvwv2wap6ccw0qq5+FTN+igAZAmmvKKvhow2Vi
-      LnPKBkc7QvxvQSNoXkdUo4qs3zOQ7DGvJLqSG9pwxFW5X1+78pNEm5OWe8AlT1uZ
-      Jz8Z1/Ae7fr/fFaucW9LkWjcuoPwPLiZ3b7ZQ6phs8qzoL+FpBI=
-      -----END RSA PRIVATE KEY-----
-  - kid: HcRvLHat12
-    key: |
-      -----BEGIN EC PRIVATE KEY-----
-      MHcCAQEEIOCCFSnkfz1ksln6kus8enQstBTu0q62IGJVzuX0WiXPoAoGCCqGSM49
-      AwEHoUQDQgAEVWPLbvSdxquLAjU3zJLcCWdaxr6QK1tPVbV1IS+87QUMv/zKiCMa
-      fNpwgBXwU7dF0gY507R2yY9pcdTmRtnRug==
-      -----END EC PRIVATE KEY-----
-  - kid: YjMITk5VSn
-    key: |
-      -----BEGIN EC PRIVATE KEY-----
-      MIGkAgEBBDCoPSjaN7qqnPz+vdzHeIy8RZCCtFOqLTkvylM1gz6xOGaVsS63VJw9
-      Td9BtpolZ0egBwYFK4EEACKhZANiAAT8tH88HYBHNiQTSqZzlxElSuSDC0+Xn0O9
-      ukj0xTTVBp8rUM9lCJQAlB8PjS2XK/n0YvYdzysQb3AYqszJa45/rOGvSar30YNE
-      gwpJvu36xNIKZT+nHalNwg069FdjNBc=
-      -----END EC PRIVATE KEY-----
-  - kid: NvFzzeMRU3
-    key: |
-      -----BEGIN EC PRIVATE KEY-----
-      MHQCAQEEILJEmFPDGFZoBVBQf1P6h4YfasYsFiu8a6FrFxiJvKXPoAcGBSuBBAAK
-      oUQDQgAE4NY5H3+D8r9GNOhrpbUn2dvLZIzi4A+SiwfqvtvPEmZkW+KDbd2tzKmx
-      maydZBn52QWedVY65snGAEoh9mV1TQ==
-      -----END EC PRIVATE KEY-----
-passwords:
-  enabled: true
-  schemes:
-  - version: 1
-    algorithm: argon2id
-  minimum_complexity: 0
-account:
-  password_registration_enabled: true
-  password_registration_email_required: false
-matrix:
-  kind: synapse
-  homeserver: localhost
-  secret: IhKoLn6jWf1qRRZWvqgaKuIdwD6H0Mvx
-  endpoint: http://synapse:8448/
-
-policy:
-  data:
-    client_registration:
-      allow_insecure_uris: true
--- a/docker/synapse/delayed_accounts_creation.sh
+++ b/docker/synapse/delayed_accounts_creation.sh
@@ -0,0 +1,2 @@
+register_new_matrix_user -a --user admin1 --password admin1 --config /config/homeserver.yaml;
+register_new_matrix_user --no-admin --user user1 --password user1 --config /config/homeserver.yaml;
--- a/docker/synapse/homeserver.yaml
+++ b/docker/synapse/homeserver.yaml
@@ -33,9 +33,3 @@ signing_key_path: "/config/localhost.signing.key"
 trusted_key_servers:
  - server_name: "matrix.org"
 # vim:ft=yaml
-matrix_authentication_service:
-  enabled: true
-  endpoint: http://mas:8778/
-  secret: "IhKoLn6jWf1qRRZWvqgaKuIdwD6H0Mvx"
-  # Alternatively, using a file:
-  #secret_file: /path/to/secret.txt
--- a/src/broadcast_messages.rs
+++ b/src/broadcast_messages.rs
@@ -42,5 +42,5 @@ pub enum BroadcastMessage {
    /// Stop a client with a given client ID
    StopSyncClient(SyncClientID),
    /// Propagate a new sync event
-    SyncEvent(UserID, Box<SyncEvent>),
+    SyncEvent(UserID, SyncEvent),
 }
--- a/src/server/api/ws.rs
+++ b/src/server/api/ws.rs
@@ -34,7 +34,7 @@ pub async fn ws(
    if let Err(e) = tx.send(BroadcastMessage::StartSyncTaskForUser(
        auth.user.user_id.clone(),
    )) {
-        log::error!("Failed to send StartSyncTaskForUser: {e}");
+        log::error!("Failed to send StartSyncTaskForUser: {}", e);
    }

    let rx = tx.subscribe();
@@ -94,9 +94,9 @@ pub async fn ws_handler(
                        }

                        // Send the message to the websocket
-                        if let Ok(msg) = serde_json::to_string(&WsMessage::Sync(*event)) {
+                        if let Ok(msg) = serde_json::to_string(&WsMessage::Sync(event)) {
                            if let Err(e) = session.text(msg).await {
-                                log::error!("Failed to send SyncEvent: {e}");
+                                log::error!("Failed to send SyncEvent: {}", e);
                            }
                        }
                    }
--- a/src/server/web_ui.rs
+++ b/src/server/web_ui.rs
@@ -105,12 +105,12 @@ pub async fn home(

                // Close sync task
                if let Err(e) = tx.send(BroadcastMessage::StopSyncTaskForUser(user.id.clone())) {
-                    log::error!("Failed to send StopSyncClientForUser: {e}");
+                    log::error!("Failed to send StopSyncClientForUser: {}", e);
                }

                // Invalidate all Ws connections
                if let Err(e) = tx.send(BroadcastMessage::CloseAllUserSessions(user.id.clone())) {
-                    log::error!("Failed to send CloseAllUserSessions: {e}");
+                    log::error!("Failed to send CloseAllUserSessions: {}", e);
                }
            }
        }
@@ -145,7 +145,7 @@ pub async fn home(
            success_message = Some("The client was successfully deleted!".to_string());

            if let Err(e) = tx.send(BroadcastMessage::CloseClientSession(delete_client_id)) {
-                log::error!("Failed to send CloseClientSession: {e}");
+                log::error!("Failed to send CloseClientSession: {}", e);
            }
        }
    }
@@ -215,7 +215,7 @@ pub async fn oidc_cb(session: Session, query: web::Query<AuthCallbackQuery>) ->
        name: user.name.unwrap_or("no_name".to_string()),
        email: user.email.unwrap_or("no@mail.com".to_string()),
    };
-    log::info!("Successful authentication as {user:?}");
+    log::info!("Successful authentication as {:?}", user);
    session.insert(USER_SESSION_KEY, user)?;

    Ok(HttpResponse::Found()
--- a/src/sync_client.rs
+++ b/src/sync_client.rs
@@ -28,7 +28,7 @@ pub async fn sync_client_manager(tx: broadcast::Sender<BroadcastMessage>) -> ! {
                    continue;
                }

-                log::info!("Start sync task for user {user_id:?}");
+                log::info!("Start sync task for user {:?}", user_id);
                let task_id = SyncClientID(uuid::Uuid::new_v4());
                running_tasks.insert(user_id.clone(), task_id.clone());

@@ -41,7 +41,7 @@ pub async fn sync_client_manager(tx: broadcast::Sender<BroadcastMessage>) -> ! {
            BroadcastMessage::StopSyncTaskForUser(user_id) => {
                // Check if a task is running for this user
                if let Some(task_id) = running_tasks.remove(&user_id) {
-                    log::info!("Stop sync task for user {user_id:?}");
+                    log::info!("Stop sync task for user {:?}", user_id);
                    tx.send(BroadcastMessage::StopSyncClient(task_id)).unwrap();
                } else {
                    log::info!("Not stopping sync task for user {user_id:?}: not running");
@@ -122,12 +122,12 @@ async fn sync_task(
                match msg_stream {
                    Ok(Some(msg)) => {
                        log::debug!("Received new message from Matrix: {msg:#?}");
-                        if let Err(e) = tx.send(BroadcastMessage::SyncEvent(user_id.clone(), Box::new(SyncEvent {
+                        if let Err(e) = tx.send(BroadcastMessage::SyncEvent(user_id.clone(), SyncEvent {
                            rooms: msg.rooms,presence: msg.presence,
                            account_data: msg.account_data,
                            to_device: msg.to_device,
                            device_lists: msg.device_lists,
-                        }))) {
+                        })) {
                            log::error!("Failed to propagate event! {e}");
                        }
                    }
--- a/src/user.rs
+++ b/src/user.rs
@@ -147,7 +147,7 @@ impl UserConfig {
                log::warn!("The bucket does not seem to exists, trying to create it!")
            }
            Err(e) => {
-                log::error!("Got unexpected error when querying bucket info: {e}");
+                log::error!("Got unexpected error when querying bucket info: {}", e);
                return Err(e.into());
            }
        }