[fractal/fractal-next] user-facing-error: Rename file to be more consistent
- From: Julian Sparber <jsparber src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal/fractal-next] user-facing-error: Rename file to be more consistent
- Date: Thu, 9 Dec 2021 13:09:28 +0000 (UTC)
commit f7016fa310dcf9871bb984799fc573fae03d5a43
Author: Kévin Commaille <zecakeh tedomum fr>
Date: Thu Dec 9 10:38:38 2021 +0100
user-facing-error: Rename file to be more consistent
po/POTFILES.in | 2 +-
src/main.rs | 4 ++--
src/meson.build | 2 +-
src/session/mod.rs | 2 +-
src/session/room/event_actions.rs | 3 +--
src/{matrix_error.rs => user_facing_error.rs} | 0
src/window.rs | 2 +-
7 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9bba3ee6..60ccf4bc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -65,7 +65,6 @@ src/contrib/qr_code.rs
src/error.rs
src/login.rs
src/main.rs
-src/matrix_error.rs
src/secret.rs
src/session/account_settings/devices_page/device.rs
src/session/account_settings/devices_page/device_item.rs
@@ -129,5 +128,6 @@ src/session/verification/mod.rs
src/session/verification/session_verification.rs
src/session/verification/verification_list.rs
src/session/user.rs
+src/user_facing_error.rs
src/utils.rs
src/window.rs
diff --git a/src/main.rs b/src/main.rs
index 6bd24367..2fe9eb23 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,17 +11,17 @@ mod components;
mod contrib;
mod error;
mod login;
-mod matrix_error;
mod secret;
mod session;
+mod user_facing_error;
mod utils;
mod window;
use self::application::Application;
use self::error::Error;
use self::login::Login;
-use self::matrix_error::UserFacingError;
use self::session::Session;
+use self::user_facing_error::UserFacingError;
use self::window::Window;
use config::{GETTEXT_PACKAGE, LOCALEDIR, RESOURCES_FILE};
diff --git a/src/meson.build b/src/meson.build
index a4e93ffb..c12f114d 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -41,10 +41,10 @@ sources = files(
'config.rs',
'error.rs',
'main.rs',
- 'matrix_error.rs',
'window.rs',
'login.rs',
'secret.rs',
+ 'user_facing_error.rs',
'utils.rs',
'session/avatar.rs',
'session/event_source_dialog.rs',
diff --git a/src/session/mod.rs b/src/session/mod.rs
index c7583b26..295f8592 100644
--- a/src/session/mod.rs
+++ b/src/session/mod.rs
@@ -26,10 +26,10 @@ use crate::secret;
use crate::secret::Secret;
use crate::secret::StoredSession;
use crate::Error;
+use crate::UserFacingError;
use crate::Window;
use crate::{spawn, spawn_tokio};
-use crate::matrix_error::UserFacingError;
use adw::subclass::prelude::BinImpl;
use futures::StreamExt;
use gettextrs::gettext;
diff --git a/src/session/room/event_actions.rs b/src/session/room/event_actions.rs
index de99e4e7..3b445436 100644
--- a/src/session/room/event_actions.rs
+++ b/src/session/room/event_actions.rs
@@ -5,11 +5,10 @@ use matrix_sdk::ruma::events::{room::message::MessageType, AnyMessageEventConten
use once_cell::sync::Lazy;
use crate::{
- matrix_error::UserFacingError,
session::{event_source_dialog::EventSourceDialog, room::Event},
spawn,
utils::cache_dir,
- Error, Window,
+ Error, UserFacingError, Window,
};
// This is only save because the trait `EventActions` can
diff --git a/src/matrix_error.rs b/src/user_facing_error.rs
similarity index 100%
rename from src/matrix_error.rs
rename to src/user_facing_error.rs
diff --git a/src/window.rs b/src/window.rs
index 7cea5193..087d9809 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -4,7 +4,7 @@ use crate::secret;
use crate::Application;
use crate::Login;
use crate::Session;
-use crate::{matrix_error::UserFacingError, Error};
+use crate::{Error, UserFacingError};
use adw::subclass::prelude::AdwApplicationWindowImpl;
use gettextrs::gettext;
use glib::signal::Inhibit;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]