refactor(sdk): Simplify some error matching

By using helper methods on error types.

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

Author: zecakeh

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

@@ -33,7 +33,7 @@ pub use oauth2::{
     RequestTokenError, StandardErrorResponse,
     basic::{BasicErrorResponse, BasicRequestTokenError},
 };
-use ruma::api::error::{ErrorKind, FromHttpResponseError};
+use ruma::api::error::ErrorKind;
 use thiserror::Error;
 use tokio::sync::Mutex;
 use url::Url;
@@ -125,11 +125,8 @@ pub enum QRCodeLoginError {
 impl From<SecureChannelError> for QRCodeLoginError {
     fn from(e: SecureChannelError) -> Self {
         match e {
-            SecureChannelError::RendezvousChannel(HttpError::Api(ref boxed)) => {
-                if let FromHttpResponseError::Server(api_error) = boxed.as_ref()
-                    && let Some(ErrorKind::NotFound) =
-                        api_error.as_client_api_error().and_then(|e| e.error_kind())
-                {
+            SecureChannelError::RendezvousChannel(ref http_error) => {
+                if let Some(ErrorKind::NotFound) = http_error.client_api_error_kind() {
                     return Self::NotFound;
                 }
                 Self::SecureChannel(e)
@@ -195,11 +192,8 @@ pub enum QRCodeGrantLoginError {
 impl From<SecureChannelError> for QRCodeGrantLoginError {
     fn from(e: SecureChannelError) -> Self {
         match e {
-            SecureChannelError::RendezvousChannel(HttpError::Api(ref boxed)) => {
-                if let FromHttpResponseError::Server(api_error) = boxed.as_ref()
-                    && let Some(ErrorKind::NotFound) =
-                        api_error.as_client_api_error().and_then(|e| e.error_kind())
-                {
+            SecureChannelError::RendezvousChannel(ref http_error) => {
+                if let Some(ErrorKind::NotFound) = http_error.client_api_error_kind() {
                     return Self::NotFound;
                 }
                 Self::SecureChannel(e)

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

@@ -97,7 +97,7 @@ use self::{
     verification::{SasVerification, Verification, VerificationRequest},
 };
 use crate::{
-    Client, Error, HttpError, Result, Room, RumaApiError, TransmissionProgress,
+    Client, Error, HttpError, Result, Room, TransmissionProgress,
     attachment::Thumbnail,
     client::{ClientInner, WeakClient},
     cross_process_lock::CrossProcessLockGuard,
@@ -753,8 +753,8 @@ impl Client {
                 let response = self.keys_upload(r.request_id(), request).await;
 
                 if let Err(e) = &response {
-                    match e.as_ruma_api_error() {
-                        Some(RumaApiError::ClientApi(e)) if e.status_code == 400 => {
+                    match e.as_client_api_error() {
+                        Some(e) if e.status_code == 400 => {
                             if let ErrorBody::Standard(StandardErrorBody { message, .. }) = &e.body
                             {
                                 // This is one of the nastiest errors we can have. The server

crates/matrix-sdk/src/room/shared_room_history.rs

@@ -263,11 +263,7 @@ pub(crate) async fn maybe_accept_key_bundle(room: &Room, inviter: &UserId) -> Re
         Err(err) => {
             // If we encountered an HTTP client error, we should check the status code to
             // see if we have been sent a bogus link.
-            let Some(err) = err
-                .as_ruma_api_error()
-                .and_then(|e| e.as_client_api_error())
-                .and_then(|e| e.error_kind())
-            else {
+            let Some(err) = err.client_api_error_kind() else {
                 // Some other error occurred, which we may be able to recover from at the next
                 // client startup.
                 return Ok(());

crates/matrix-sdk/tests/integration/matrix_auth.rs

@@ -2,7 +2,7 @@ use std::{collections::BTreeMap, sync::Mutex};
 
 use assert_matches::assert_matches;
 use matrix_sdk::{
-    AuthApi, AuthSession, Client, RumaApiError, SessionTokens,
+    AuthApi, AuthSession, Client, SessionTokens,
     authentication::matrix::MatrixSession,
     config::RequestConfig,
     test_utils::{logged_in_client_with_server, no_retry_test_client_with_server},
@@ -233,7 +233,7 @@ async fn test_login_error() {
         .await;
 
     if let Err(err) = client.matrix_auth().login_username("example", "wordpass").send().await {
-        if let Some(RumaApiError::ClientApi(api_err)) = err.as_ruma_api_error() {
+        if let Some(api_err) = err.as_client_api_error() {
             assert_eq!(api_err.status_code, http::StatusCode::from_u16(403).unwrap());
 
             if let api::error::ErrorBody::Standard(StandardErrorBody { kind, message, .. }) =