From 8acacdebc8f3fcc39b96c60c95d5f09325884c83 Mon Sep 17 00:00:00 2001 From: Matthias Ahouansou Date: Sat, 1 Mar 2025 02:44:24 +0000 Subject: [PATCH] chore: bump ruma & rust --- Cargo.lock | 24 ++++++++++++------------ Cargo.toml | 2 +- complement/Dockerfile | 2 +- flake.nix | 2 +- rust-toolchain.toml | 2 +- src/api/server_server.rs | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4cca6c5a..a6d9d3a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2190,7 +2190,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.12.1" -source = "git+https://github.com/ruma/ruma.git#afaf132362fe6195556a872351a70337e97ab755" +source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" dependencies = [ "assign", "js_int", @@ -2210,7 +2210,7 @@ dependencies = [ [[package]] name = "ruma-appservice-api" version = "0.12.1" -source = "git+https://github.com/ruma/ruma.git#afaf132362fe6195556a872351a70337e97ab755" +source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" dependencies = [ "js_int", "ruma-common", @@ -2222,7 +2222,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.20.1" -source = "git+https://github.com/ruma/ruma.git#afaf132362fe6195556a872351a70337e97ab755" +source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" dependencies = [ "as_variant", "assign", @@ -2245,7 +2245,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.15.1" -source = "git+https://github.com/ruma/ruma.git#afaf132362fe6195556a872351a70337e97ab755" +source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" dependencies = [ "as_variant", "base64 0.22.1", @@ -2276,7 +2276,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.30.1" -source = "git+https://github.com/ruma/ruma.git#afaf132362fe6195556a872351a70337e97ab755" +source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" dependencies = [ "as_variant", "indexmap 2.2.6", @@ -2299,7 +2299,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.11.0" -source = "git+https://github.com/ruma/ruma.git#afaf132362fe6195556a872351a70337e97ab755" +source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" dependencies = [ "bytes", "http 1.1.0", @@ -2317,7 +2317,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.10.1" -source = "git+https://github.com/ruma/ruma.git#afaf132362fe6195556a872351a70337e97ab755" +source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" dependencies = [ "js_int", "thiserror 2.0.11", @@ -2326,7 +2326,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.15.1" -source = "git+https://github.com/ruma/ruma.git#afaf132362fe6195556a872351a70337e97ab755" +source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" dependencies = [ "cfg-if", "proc-macro-crate", @@ -2341,7 +2341,7 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" version = "0.11.0" -source = "git+https://github.com/ruma/ruma.git#afaf132362fe6195556a872351a70337e97ab755" +source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" dependencies = [ "js_int", "ruma-common", @@ -2353,7 +2353,7 @@ dependencies = [ [[package]] name = "ruma-server-util" version = "0.5.0" -source = "git+https://github.com/ruma/ruma.git#afaf132362fe6195556a872351a70337e97ab755" +source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" dependencies = [ "headers", "http 1.1.0", @@ -2366,7 +2366,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.17.0" -source = "git+https://github.com/ruma/ruma.git#afaf132362fe6195556a872351a70337e97ab755" +source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" dependencies = [ "base64 0.22.1", "ed25519-dalek", @@ -2382,7 +2382,7 @@ dependencies = [ [[package]] name = "ruma-state-res" version = "0.13.0" -source = "git+https://github.com/ruma/ruma.git#afaf132362fe6195556a872351a70337e97ab755" +source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" dependencies = [ "js_int", "ruma-common", diff --git a/Cargo.toml b/Cargo.toml index 3e463174..e5fbd41a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ repository = "https://gitlab.com/famedly/conduit" version = "0.10.0-alpha" # See also `rust-toolchain.toml` -rust-version = "1.80.0" +rust-version = "1.81.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/complement/Dockerfile b/complement/Dockerfile index 0bf0cfcd..ce067ec3 100644 --- a/complement/Dockerfile +++ b/complement/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.80.0 +FROM rust:1.81.0 WORKDIR /workdir diff --git a/flake.nix b/flake.nix index 4b50a7ec..df05bf86 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,7 @@ file = ./rust-toolchain.toml; # See also `rust-toolchain.toml` - sha256 = "sha256-6eN/GKzjVSjEhGO9FhWObkRFaE1Jf+uqMSdQnb8lcB4="; + sha256 = "sha256-VZZnlyP69+Y3crrLHQyJirqlHrTtGTsyiSnZB8jEvVo="; }; }); in diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 995b142b..465ffdee 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -9,7 +9,7 @@ # If you're having trouble making the relevant changes, bug a maintainer. [toolchain] -channel = "1.80.0" +channel = "1.81.0" components = [ # For rust-analyzer "rust-src", diff --git a/src/api/server_server.rs b/src/api/server_server.rs index 60d37bde..8b8e6d30 100644 --- a/src/api/server_server.rs +++ b/src/api/server_server.rs @@ -640,7 +640,7 @@ async fn request_well_known(destination: &str) -> Option<(String, Instant)> { let response = services() .globals .default_client() - .get(&format!("https://{destination}/.well-known/matrix/server")) + .get(format!("https://{destination}/.well-known/matrix/server")) .send() .await; debug!("Got well known response");