[fractal/fractal-next] error: UserFacingMatrixError -> UserFacingError



commit 19f34f6d4549978061ccf766bcf69638fc734302
Author: Enterprisey <59171-enterprisey users noreply gitlab gnome org>
Date:   Sun Oct 31 01:37:19 2021 -0700

    error: UserFacingMatrixError -> UserFacingError
    
    Renamed because the trait will now be used for other types of errors.

 src/main.rs                      | 2 +-
 src/matrix_error.rs              | 6 +++---
 src/session/mod.rs               | 2 +-
 src/session/room_creation/mod.rs | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/main.rs b/src/main.rs
index e50ec1c4..c1c13967 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -20,7 +20,7 @@ mod window;
 use self::application::Application;
 use self::error::Error;
 use self::login::Login;
-use self::matrix_error::UserFacingMatrixError;
+use self::matrix_error::UserFacingError;
 use self::session::Session;
 use self::window::Window;
 
diff --git a/src/matrix_error.rs b/src/matrix_error.rs
index 31747752..d1f366aa 100644
--- a/src/matrix_error.rs
+++ b/src/matrix_error.rs
@@ -8,11 +8,11 @@ use matrix_sdk::{
 
 use gettextrs::gettext;
 
-pub trait UserFacingMatrixError {
+pub trait UserFacingError {
     fn to_user_facing(self) -> String;
 }
 
-impl UserFacingMatrixError for HttpError {
+impl UserFacingError for HttpError {
     fn to_user_facing(self) -> String {
         match self {
             HttpError::Reqwest(_) => {
@@ -44,7 +44,7 @@ impl UserFacingMatrixError for HttpError {
     }
 }
 
-impl UserFacingMatrixError for Error {
+impl UserFacingError for Error {
     fn to_user_facing(self) -> String {
         match self {
             Error::Http(http_error) => http_error.to_user_facing(),
diff --git a/src/session/mod.rs b/src/session/mod.rs
index 8c84a650..00c0ae08 100644
--- a/src/session/mod.rs
+++ b/src/session/mod.rs
@@ -25,7 +25,7 @@ use crate::Error;
 use crate::Window;
 use crate::{spawn, spawn_tokio};
 
-use crate::matrix_error::UserFacingMatrixError;
+use crate::matrix_error::UserFacingError;
 use crate::session::content::ContentType;
 use adw::subclass::prelude::BinImpl;
 use futures::StreamExt;
diff --git a/src/session/room_creation/mod.rs b/src/session/room_creation/mod.rs
index 0783cc4c..0b142209 100644
--- a/src/session/room_creation/mod.rs
+++ b/src/session/room_creation/mod.rs
@@ -23,7 +23,7 @@ use matrix_sdk::{
     HttpError,
 };
 
-use crate::UserFacingMatrixError;
+use crate::UserFacingError;
 
 // MAX length of room addresses
 const MAX_BYTES: usize = 255;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]