Upgrade Ruma

A new batch of breaking changes, allowing to stop providing dummy
`SupportedVersions` where they are not necessary.

Signed-off-by: Kévin Commaille <[email protected]>

Author: zecakeh

Cargo.lock

@@ -66,7 +66,7 @@ rand = "0.8.5"
 regex = "1.11.2"
 reqwest = { version = "0.12.23", default-features = false }
 rmp-serde = "1.3.0"
-ruma = { git = "https://github.com/ruma/ruma", rev = "670349f66f7e3f403c6730967768472dcf1bcf60", features = [
+ruma = { git = "https://github.com/ruma/ruma", rev = "bbb4a14e14864d364b78d605532db580eb2b28f0", features = [
     "client-api-c",
     "compat-upload-signatures",
     "compat-arbitrary-length-ids",

Cargo.toml

@@ -16,9 +16,9 @@
 
 //! Types to interact with the native Matrix authentication API.
 
-use std::fmt;
 #[cfg(feature = "sso-login")]
 use std::future::Future;
+use std::{borrow::Cow, fmt};
 
 use matrix_sdk_base::{SessionMeta, store::RoomLoadSettings};
 use ruma::{
@@ -112,13 +112,13 @@ impl MatrixAuth {
                 .try_into_http_request::<Vec<u8>>(
                     homeserver.as_str(),
                     SendAccessToken::None,
-                    &supported_versions,
+                    Cow::Owned(supported_versions),
                 )
         } else {
             sso_login::v3::Request::new(redirect_url.to_owned()).try_into_http_request::<Vec<u8>>(
                 homeserver.as_str(),
                 SendAccessToken::None,
-                &supported_versions,
+                Cow::Owned(supported_versions),
             )
         };
 

crates/matrix-sdk/src/authentication/matrix/mod.rs

@@ -113,6 +113,8 @@ impl RendezvousChannel {
         client: HttpClient,
         rendezvous_server: &Url,
     ) -> Result<Self, HttpError> {
+        use std::borrow::Cow;
+
         use ruma::api::{SupportedVersions, client::rendezvous::create_rendezvous_session};
 
         let request = create_rendezvous_session::unstable::Request::default();
@@ -122,7 +124,10 @@ impl RendezvousChannel {
                 None,
                 rendezvous_server.to_string(),
                 None,
-                &SupportedVersions { versions: Default::default(), features: Default::default() },
+                Cow::Owned(SupportedVersions {
+                    versions: Default::default(),
+                    features: Default::default(),
+                }),
                 Default::default(),
             )
             .await?;

crates/matrix-sdk/src/authentication/oauth/qrcode/rendezvous_channel.rs

@@ -14,10 +14,7 @@
 
 use ruma::{
     OwnedServerName, ServerName,
-    api::{
-        MatrixVersion, SupportedVersions,
-        client::discovery::{discover_homeserver, get_supported_versions},
-    },
+    api::client::discovery::{discover_homeserver, get_supported_versions},
 };
 use tracing::debug;
 use url::Url;
@@ -185,10 +182,7 @@ async fn discover_homeserver(
             Some(RequestConfig::short_retry()),
             server.to_string(),
             None,
-            &SupportedVersions {
-                versions: [MatrixVersion::V1_0].into(),
-                features: Default::default(),
-            },
+            (),
             Default::default(),
         )
         .await
@@ -212,10 +206,7 @@ pub(super) async fn get_supported_versions(
             Some(RequestConfig::short_retry()),
             homeserver_url.to_string(),
             None,
-            &SupportedVersions {
-                versions: [MatrixVersion::V1_0].into(),
-                features: Default::default(),
-            },
+            (),
             Default::default(),
         )
         .await

crates/matrix-sdk/src/client/builder/homeserver_config.rs

@@ -24,6 +24,7 @@ use ruma::api::{
     OutgoingRequest,
     client::{error::ErrorKind, media},
     error::FromHttpResponseError,
+    path_builder::PathBuilder,
 };
 use tracing::{error, trace};
 
@@ -33,7 +34,7 @@ use crate::{
     authentication::oauth::OAuthError,
     config::RequestConfig,
     error::{HttpError, HttpResult},
-    http_client::SupportedAuthScheme,
+    http_client::{SupportedAuthScheme, SupportedPathBuilder},
     media::MediaError,
 };
 
@@ -79,6 +80,8 @@ impl<R> IntoFuture for SendRequest<R>
 where
     R: OutgoingRequest + Clone + Debug + SendOutsideWasm + SyncOutsideWasm + 'static,
     R::Authentication: SupportedAuthScheme,
+    R::PathBuilder: SupportedPathBuilder,
+    for<'a> <R::PathBuilder as PathBuilder>::Input<'a>: SendOutsideWasm + SyncOutsideWasm,
     R::IncomingResponse: SendOutsideWasm + SyncOutsideWasm,
     HttpError: From<FromHttpResponseError<R::EndpointError>>,
 {

crates/matrix-sdk/src/client/futures.rs

@@ -45,7 +45,7 @@ use ruma::{
     DeviceId, OwnedDeviceId, OwnedEventId, OwnedRoomId, OwnedRoomOrAliasId, OwnedServerName,
     RoomAliasId, RoomId, RoomOrAliasId, ServerName, UInt, UserId,
     api::{
-        FeatureFlag, MatrixVersion, OutgoingRequest, SupportedVersions,
+        FeatureFlag, MatrixVersion, Metadata, OutgoingRequest, SupportedVersions,
         client::{
             account::whoami,
             alias::{create_alias, delete_alias, get_alias},
@@ -71,6 +71,7 @@ use ruma::{
         },
         error::FromHttpResponseError,
         federation::discovery::get_server_version,
+        path_builder::PathBuilder,
     },
     assign,
     events::direct::DirectUserIdentifier,
@@ -99,7 +100,7 @@ use crate::{
         EventHandler, EventHandlerContext, EventHandlerDropGuard, EventHandlerHandle,
         EventHandlerStore, ObservableEventHandler, SyncEvent,
     },
-    http_client::{HttpClient, SupportedAuthScheme},
+    http_client::{HttpClient, SupportedAuthScheme, SupportedPathBuilder},
     latest_events::LatestEvents,
     media::MediaError,
     notification_settings::NotificationSettings,
@@ -1895,6 +1896,8 @@ impl Client {
     where
         Request: OutgoingRequest + Clone + Debug,
         Request::Authentication: SupportedAuthScheme,
+        Request::PathBuilder: SupportedPathBuilder,
+        for<'a> <Request::PathBuilder as PathBuilder>::Input<'a>: SendOutsideWasm + SyncOutsideWasm,
         HttpError: From<FromHttpResponseError<Request::EndpointError>>,
     {
         SendRequest {
@@ -1914,10 +1917,13 @@ impl Client {
     where
         Request: OutgoingRequest + Debug,
         Request::Authentication: SupportedAuthScheme,
+        Request::PathBuilder: SupportedPathBuilder,
+        for<'a> <Request::PathBuilder as PathBuilder>::Input<'a>: SendOutsideWasm + SyncOutsideWasm,
         HttpError: From<FromHttpResponseError<Request::EndpointError>>,
     {
         let homeserver = self.homeserver().to_string();
         let access_token = self.access_token();
+        let path_builder_input = Request::PathBuilder::get_path_builder_input(self).await?;
 
         self.inner
             .http_client
@@ -1926,7 +1932,7 @@ impl Client {
                 config,
                 homeserver,
                 access_token.as_deref(),
-                &self.supported_versions().await?,
+                path_builder_input,
                 send_progress,
             )
             .await
@@ -1946,19 +1952,7 @@ impl Client {
         request_config: Option<RequestConfig>,
     ) -> HttpResult<get_supported_versions::Response> {
         let server_versions = self
-            .inner
-            .http_client
-            .send(
-                get_supported_versions::Request::new(),
-                request_config,
-                self.homeserver().to_string(),
-                None,
-                &SupportedVersions {
-                    versions: [MatrixVersion::V1_0].into(),
-                    features: Default::default(),
-                },
-                Default::default(),
-            )
+            .send_inner(get_supported_versions::Request::new(), request_config, Default::default())
             .await?;
 
         Ok(server_versions)
@@ -1983,10 +1977,7 @@ impl Client {
                 Some(RequestConfig::short_retry()),
                 server_url_string,
                 None,
-                &SupportedVersions {
-                    versions: [MatrixVersion::V1_0].into(),
-                    features: Default::default(),
-                },
+                (),
                 Default::default(),
             )
             .await;
@@ -2925,8 +2916,8 @@ impl Client {
 
         // Use the authenticated endpoint when the server supports it.
         let supported_versions = self.supported_versions().await?;
-        let use_auth =
-            authenticated_media::get_media_config::v1::Request::is_supported(&supported_versions);
+        let use_auth = authenticated_media::get_media_config::v1::Request::PATH_BUILDER
+            .is_supported(&supported_versions);
 
         let upload_size = if use_auth {
             self.send(authenticated_media::get_media_config::v1::Request::default())