Upgrade Ruma after api::Error breaking change

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>

Author: zecakeh

Cargo.lock

@@ -71,7 +71,7 @@ rand = { version = "0.10.0", default-features = false, features = ["std", "std_r
 regex = { version = "1.12.2", default-features = false }
 reqwest = { version = "0.13.1", default-features = false }
 rmp-serde = { version = "1.3.0", default-features = false }
-ruma = { git = "https://github.com/ruma/ruma", rev = "390d07ba915003fb8c5c625cf461d4c43370fa6a", features = [
+ruma = { git = "https://github.com/ruma/ruma", rev = "7680eebd9586669e1a4e5b1fd1c2c691221369d4", features = [
     "client-api-c",
     "compat-unset-avatar",
     "compat-upload-signatures",

Cargo.toml

@@ -71,15 +71,17 @@ use matrix_sdk_ui::{
 use mime::Mime;
 use oauth2::Scope;
 use ruma::{
-    api::client::{
-        alias::get_alias,
-        discovery::get_authorization_server_metadata::v1::{
-            AccountManagementActionData, DeviceDeleteData, DeviceViewData,
+    api::{
+        client::{
+            alias::get_alias,
+            discovery::get_authorization_server_metadata::v1::{
+                AccountManagementActionData, DeviceDeleteData, DeviceViewData,
+            },
+            profile::{AvatarUrl, DisplayName},
+            room::create_room::{v3::CreationContent, RoomPowerLevelsContentOverride},
+            uiaa::{EmailUserIdentifier, UserIdentifier},
         },
         error::ErrorKind,
-        profile::{AvatarUrl, DisplayName},
-        room::create_room::{v3::CreationContent, RoomPowerLevelsContentOverride},
-        uiaa::{EmailUserIdentifier, UserIdentifier},
     },
     events::{
         direct::DirectEventContent,

bindings/matrix-sdk-ffi/src/client.rs

@@ -26,7 +26,7 @@ use matrix_sdk::{
 };
 use matrix_sdk_ui::{encryption_sync_service, notification_client, spaces, sync_service, timeline};
 use ruma::{
-    api::client::error::{ErrorBody, ErrorKind as RumaApiErrorKind, RetryAfter, StandardErrorBody},
+    api::error::{ErrorBody, ErrorKind as RumaApiErrorKind, RetryAfter, StandardErrorBody},
     MilliSecondsSinceUnixEpoch,
 };
 use tracing::warn;

bindings/matrix-sdk-ffi/src/error.rs

@@ -742,8 +742,7 @@ impl TerminationReport {
         match &self.error {
             Some(Error::RoomList(room_list_service::Error::SlidingSync(error)))
             | Some(Error::EncryptionSync(encryption_sync_service::Error::SlidingSync(error))) => {
-                error.client_api_error_kind()
-                    == Some(&ruma::api::client::error::ErrorKind::UnknownPos)
+                error.client_api_error_kind() == Some(&ruma::api::error::ErrorKind::UnknownPos)
             }
             _ => false,
         }

crates/matrix-sdk-ui/src/sync_service.rs

@@ -315,7 +315,7 @@ async fn test_reloaded_failed_local_echoes_are_marked_as_failed() {
     // And it's properly pattern-matched as an HTTP error.
     assert_matches!(
         error.as_client_api_error().unwrap().error_kind(),
-        Some(ruma::api::client::error::ErrorKind::TooLarge)
+        Some(ruma::api::error::ErrorKind::TooLarge)
     );
 
     assert_pending!(timeline_stream);

crates/matrix-sdk-ui/tests/integration/timeline/queue.rs

@@ -40,13 +40,13 @@ use ruma::{
                 request_3pid_management_token_via_email, request_3pid_management_token_via_msisdn,
             },
             config::{get_global_account_data, set_global_account_data},
-            error::ErrorKind,
             profile::{
                 DisplayName, StaticProfileField, delete_profile_field, get_avatar_url, get_profile,
                 get_profile_field, set_avatar_url, set_display_name, set_profile_field,
             },
             uiaa::AuthData,
         },
+        error::ErrorKind,
     },
     assign,
     events::{
@@ -379,7 +379,7 @@ impl Account {
     /// response, which would result in `Ok(None)`. Note that this error code
     /// might also mean that the given user ID doesn't exist.
     ///
-    /// [`ErrorCode::NotFound`]: ruma::api::client::error::ErrorCode::NotFound
+    /// [`ErrorCode::NotFound`]: ruma::api::error::ErrorCode::NotFound
     pub async fn fetch_profile_field_of(
         &self,
         user_id: OwnedUserId,
@@ -411,7 +411,7 @@ impl Account {
     /// response, which would result in `Ok(None)`. Note that this error code
     /// might also mean that the given user ID doesn't exist.
     ///
-    /// [`ErrorCode::NotFound`]: ruma::api::client::error::ErrorCode::NotFound
+    /// [`ErrorCode::NotFound`]: ruma::api::error::ErrorCode::NotFound
     pub async fn fetch_profile_field_of_static<F>(
         &self,
         user_id: OwnedUserId,
@@ -517,7 +517,7 @@ impl Account {
     /// ```
     /// [uiaa]: https://spec.matrix.org/v1.2/client-server-api/#user-interactive-authentication-api
     /// [`UiaaResponse`]: ruma::api::client::uiaa::UiaaResponse
-    /// [`ErrorKind::WeakPassword`]: ruma::api::client::error::ErrorKind::WeakPassword
+    /// [`ErrorKind::WeakPassword`]: ruma::api::error::ErrorKind::WeakPassword
     pub async fn change_password(
         &self,
         new_password: &str,
@@ -668,8 +668,8 @@ impl Account {
     /// # anyhow::Ok(()) };
     /// ```
     /// [3pid]: https://spec.matrix.org/v1.2/appendices/#3pid-types
-    /// [`ErrorKind::ThreepidInUse`]: ruma::api::client::error::ErrorKind::ThreepidInUse
-    /// [`ErrorKind::ThreepidDenied`]: ruma::api::client::error::ErrorKind::ThreepidDenied
+    /// [`ErrorKind::ThreepidInUse`]: ruma::api::error::ErrorKind::ThreepidInUse
+    /// [`ErrorKind::ThreepidDenied`]: ruma::api::error::ErrorKind::ThreepidDenied
     pub async fn request_3pid_email_token(
         &self,
         client_secret: &ClientSecret,
@@ -743,8 +743,8 @@ impl Account {
     /// # anyhow::Ok(()) };
     /// ```
     /// [3pid]: https://spec.matrix.org/v1.2/appendices/#3pid-types
-    /// [`ErrorKind::ThreepidInUse`]: ruma::api::client::error::ErrorKind::ThreepidInUse
-    /// [`ErrorKind::ThreepidDenied`]: ruma::api::client::error::ErrorKind::ThreepidDenied
+    /// [`ErrorKind::ThreepidInUse`]: ruma::api::error::ErrorKind::ThreepidInUse
+    /// [`ErrorKind::ThreepidDenied`]: ruma::api::error::ErrorKind::ThreepidDenied
     pub async fn request_3pid_msisdn_token(
         &self,
         client_secret: &ClientSecret,

crates/matrix-sdk/src/account.rs

@@ -504,7 +504,7 @@ impl MatrixAuth {
     /// ```
     ///
     /// [refreshing access tokens]: https://spec.matrix.org/v1.3/client-server-api/#refreshing-access-tokens
-    /// [`UnknownToken`]: ruma::api::client::error::ErrorKind::UnknownToken
+    /// [`UnknownToken`]: ruma::api::error::ErrorKind::UnknownToken
     /// [restore the session]: Client::restore_session
     /// [`ClientBuilder::handle_refresh_tokens()`]: crate::ClientBuilder::handle_refresh_tokens
     pub async fn refresh_access_token(&self) -> Result<(), RefreshTokenError> {

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

@@ -155,8 +155,8 @@
 //! [MSC4108]: https://github.com/matrix-org/matrix-spec-proposals/pull/4108
 //! [RFC 8628]: https://datatracker.ietf.org/doc/html/rfc8628
 //! [`ClientBuilder::handle_refresh_tokens()`]: crate::ClientBuilder::handle_refresh_tokens()
-//! [`Error`]: ruma::api::client::error::Error
-//! [`ErrorKind::UnknownToken`]: ruma::api::client::error::ErrorKind::UnknownToken
+//! [`Error`]: ruma::api::error::Error
+//! [`ErrorKind::UnknownToken`]: ruma::api::error::ErrorKind::UnknownToken
 //! [`examples/oauth_cli`]: https://github.com/matrix-org/matrix-rust-sdk/tree/main/examples/oauth_cli
 
 #[cfg(feature = "e2e-encryption")]

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

@@ -33,7 +33,7 @@ pub use oauth2::{
     RequestTokenError, StandardErrorResponse,
     basic::{BasicErrorResponse, BasicRequestTokenError},
 };
-use ruma::api::{client::error::ErrorKind, error::FromHttpResponseError};
+use ruma::api::error::{ErrorKind, FromHttpResponseError};
 use thiserror::Error;
 use tokio::sync::Mutex;
 use url::Url;