GNOME.org
 

[fractal] App: use mod aliases for imports

commit aac1d91d68fc6bcf92f9b55a1b0a9d7a1a1743f1
Author: Alejandro Domínguez <adomu net-c com>
Date:   Fri Jun 26 03:12:00 2020 +0200

    App: use mod aliases for imports

 fractal-gtk/src/actions/account_settings.rs | 2 +-
 fractal-gtk/src/actions/global.rs           | 2 +-
 fractal-gtk/src/actions/message.rs          | 2 +-
 fractal-gtk/src/actions/room_settings.rs    | 2 +-
 fractal-gtk/src/app/backend_loop.rs         | 2 +-
 fractal-gtk/src/app/connect/language.rs     | 2 +-
 fractal-gtk/src/appop/account.rs            | 2 +-
 fractal-gtk/src/appop/directory.rs          | 2 +-
 fractal-gtk/src/appop/invite.rs             | 2 +-
 fractal-gtk/src/appop/login.rs              | 2 +-
 fractal-gtk/src/appop/member.rs             | 2 +-
 fractal-gtk/src/appop/message.rs            | 4 ++--
 fractal-gtk/src/appop/mod.rs                | 2 +-
 fractal-gtk/src/appop/notify.rs             | 2 +-
 fractal-gtk/src/appop/room.rs               | 2 +-
 fractal-gtk/src/appop/start_chat.rs         | 2 +-
 fractal-gtk/src/appop/user.rs               | 2 +-
 fractal-gtk/src/cache/mod.rs                | 4 ++--
 fractal-gtk/src/widgets/address.rs          | 2 +-
 fractal-gtk/src/widgets/image.rs            | 4 ++--
 fractal-gtk/src/widgets/inline_player.rs    | 2 +-
 fractal-gtk/src/widgets/login.rs            | 2 +-
 fractal-gtk/src/widgets/media_viewer.rs     | 4 ++--
 fractal-gtk/src/widgets/message.rs          | 2 +-
 fractal-gtk/src/widgets/room.rs             | 2 +-
 fractal-gtk/src/widgets/room_history.rs     | 2 +-
 fractal-gtk/src/widgets/room_settings.rs    | 4 ++--
 27 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/fractal-gtk/src/actions/account_settings.rs b/fractal-gtk/src/actions/account_settings.rs
index 6181765f..3d20bb12 100644
--- a/fractal-gtk/src/actions/account_settings.rs
+++ b/fractal-gtk/src/actions/account_settings.rs
@@ -1,5 +1,5 @@
+use crate::backend::user;
 use crate::i18n::i18n;
-use fractal_api::backend::user;
 use fractal_api::identifiers::UserId;
 use fractal_api::r0::AccessToken;
 use fractal_api::url::Url;
diff --git a/fractal-gtk/src/actions/global.rs b/fractal-gtk/src/actions/global.rs
index 42333e17..2f6fc1d7 100644
--- a/fractal-gtk/src/actions/global.rs
+++ b/fractal-gtk/src/actions/global.rs
@@ -6,10 +6,10 @@ use std::sync::{Arc, Mutex};
 
 use crate::appop::AppOp;
 use crate::i18n::i18n;
+use crate::types::Message;
 use crate::widgets::FileDialog::open;
 use crate::App;
 use fractal_api::identifiers::{EventId, RoomId};
-use fractal_api::types::Message;
 use gio::prelude::*;
 use gio::SimpleAction;
 use gtk::prelude::*;
diff --git a/fractal-gtk/src/actions/message.rs b/fractal-gtk/src/actions/message.rs
index dce59bde..d4dcb603 100644
--- a/fractal-gtk/src/actions/message.rs
+++ b/fractal-gtk/src/actions/message.rs
@@ -1,4 +1,4 @@
-use fractal_api::backend::{media, room, ThreadPool};
+use crate::backend::{media, room, ThreadPool};
 use fractal_api::clone;
 use fractal_api::identifiers::RoomId;
 use fractal_api::r0::AccessToken;
diff --git a/fractal-gtk/src/actions/room_settings.rs b/fractal-gtk/src/actions/room_settings.rs
index 3e307389..f6f8d2a6 100644
--- a/fractal-gtk/src/actions/room_settings.rs
+++ b/fractal-gtk/src/actions/room_settings.rs
@@ -1,4 +1,4 @@
-use fractal_api::backend::room;
+use crate::backend::room;
 use fractal_api::identifiers::RoomId;
 use fractal_api::r0::AccessToken;
 use fractal_api::url::Url;
diff --git a/fractal-gtk/src/app/backend_loop.rs b/fractal-gtk/src/app/backend_loop.rs
index 705e0b59..81f1657e 100644
--- a/fractal-gtk/src/app/backend_loop.rs
+++ b/fractal-gtk/src/app/backend_loop.rs
@@ -7,7 +7,7 @@ use regex::Regex;
 use crate::actions::{activate_action, AppState};
 
 use crate::backend::BKResponse;
-use fractal_api::error::Error;
+use crate::error::Error;
 
 pub fn dispatch_error(error: BKResponse) {
     match error {
diff --git a/fractal-gtk/src/app/connect/language.rs b/fractal-gtk/src/app/connect/language.rs
index b033daaa..c7fe01f1 100644
--- a/fractal-gtk/src/app/connect/language.rs
+++ b/fractal-gtk/src/app/connect/language.rs
@@ -2,7 +2,7 @@ use crate::app::dispatch_error;
 use crate::app::App;
 use crate::backend::BKResponse;
 
-use fractal_api::backend::room;
+use crate::backend::room;
 use glib::object::Cast;
 use gtk::prelude::*;
 use std::thread;
diff --git a/fractal-gtk/src/appop/account.rs b/fractal-gtk/src/appop/account.rs
index a7505d2a..abaf6bcf 100644
--- a/fractal-gtk/src/appop/account.rs
+++ b/fractal-gtk/src/appop/account.rs
@@ -1,4 +1,4 @@
-use fractal_api::backend::user;
+use crate::backend::user;
 use gtk::prelude::*;
 use log::info;
 use std::path::PathBuf;
diff --git a/fractal-gtk/src/appop/directory.rs b/fractal-gtk/src/appop/directory.rs
index bfc748a2..397ab860 100644
--- a/fractal-gtk/src/appop/directory.rs
+++ b/fractal-gtk/src/appop/directory.rs
@@ -2,7 +2,7 @@ use gtk::prelude::*;
 use libhandy::Column;
 use std::thread;
 
-use fractal_api::backend::directory;
+use crate::backend::directory;
 
 use crate::app::dispatch_error;
 use crate::app::App;
diff --git a/fractal-gtk/src/appop/invite.rs b/fractal-gtk/src/appop/invite.rs
index 5abae0cc..fd0345cf 100644
--- a/fractal-gtk/src/appop/invite.rs
+++ b/fractal-gtk/src/appop/invite.rs
@@ -1,6 +1,6 @@
 use crate::i18n::{i18n, i18n_k};
 
-use fractal_api::backend::room;
+use crate::backend::room;
 use fractal_api::identifiers::{RoomId, UserId};
 use gtk::prelude::*;
 use std::thread;
diff --git a/fractal-gtk/src/appop/login.rs b/fractal-gtk/src/appop/login.rs
index 58b22747..416071c4 100644
--- a/fractal-gtk/src/appop/login.rs
+++ b/fractal-gtk/src/appop/login.rs
@@ -1,6 +1,6 @@
 use log::error;
 
-use fractal_api::backend::register;
+use crate::backend::register;
 use fractal_api::identifiers::UserId;
 use fractal_api::r0::AccessToken;
 
diff --git a/fractal-gtk/src/appop/member.rs b/fractal-gtk/src/appop/member.rs
index 25959b3e..beb78b34 100644
--- a/fractal-gtk/src/appop/member.rs
+++ b/fractal-gtk/src/appop/member.rs
@@ -1,4 +1,4 @@
-use fractal_api::backend::user;
+use crate::backend::user;
 use fractal_api::clone;
 use fractal_api::identifiers::{RoomId, UserId};
 use gtk::prelude::*;
diff --git a/fractal-gtk/src/appop/message.rs b/fractal-gtk/src/appop/message.rs
index c086e28f..ffa859da 100644
--- a/fractal-gtk/src/appop/message.rs
+++ b/fractal-gtk/src/appop/message.rs
@@ -1,9 +1,9 @@
+use crate::backend::room;
+use crate::types::ExtraContent;
 use comrak::{markdown_to_html, ComrakOptions};
-use fractal_api::backend::room;
 use fractal_api::clone;
 use fractal_api::identifiers::{EventId, RoomId};
 use fractal_api::r0::AccessToken;
-use fractal_api::types::ExtraContent;
 use fractal_api::url::Url;
 use gdk_pixbuf::Pixbuf;
 use gio::prelude::FileExt;
diff --git a/fractal-gtk/src/appop/mod.rs b/fractal-gtk/src/appop/mod.rs
index 1b2cd82f..08552ecf 100644
--- a/fractal-gtk/src/appop/mod.rs
+++ b/fractal-gtk/src/appop/mod.rs
@@ -10,7 +10,7 @@ use fractal_api::r0::AccessToken;
 
 use gtk::prelude::*;
 
-use fractal_api::backend::ThreadPool;
+use crate::backend::ThreadPool;
 use fractal_api::cache::CacheMap;
 use fractal_api::url::Url;
 
diff --git a/fractal-gtk/src/appop/notify.rs b/fractal-gtk/src/appop/notify.rs
index ae21fd27..c9e59f4f 100644
--- a/fractal-gtk/src/appop/notify.rs
+++ b/fractal-gtk/src/appop/notify.rs
@@ -1,4 +1,4 @@
-use fractal_api::backend::user;
+use crate::backend::user;
 use fractal_api::identifiers::{EventId, RoomId};
 use gio::ApplicationExt;
 use gio::FileExt;
diff --git a/fractal-gtk/src/appop/room.rs b/fractal-gtk/src/appop/room.rs
index e6ae6d84..ce47102e 100644
--- a/fractal-gtk/src/appop/room.rs
+++ b/fractal-gtk/src/appop/room.rs
@@ -1,5 +1,5 @@
+use crate::backend::room;
 use crate::i18n::{i18n, i18n_k, ni18n_f};
-use fractal_api::backend::room;
 use fractal_api::identifiers::RoomId;
 use fractal_api::url::Url;
 use log::{error, warn};
diff --git a/fractal-gtk/src/appop/start_chat.rs b/fractal-gtk/src/appop/start_chat.rs
index 63e20653..8eac5c0b 100644
--- a/fractal-gtk/src/appop/start_chat.rs
+++ b/fractal-gtk/src/appop/start_chat.rs
@@ -1,4 +1,4 @@
-use fractal_api::backend::room;
+use crate::backend::room;
 use fractal_api::identifiers::RoomId;
 use gtk::prelude::*;
 use std::thread;
diff --git a/fractal-gtk/src/appop/user.rs b/fractal-gtk/src/appop/user.rs
index f1f3a58a..0feb54bb 100644
--- a/fractal-gtk/src/appop/user.rs
+++ b/fractal-gtk/src/appop/user.rs
@@ -1,6 +1,6 @@
 use gtk::prelude::*;
 
-use fractal_api::backend::user;
+use crate::backend::user;
 use fractal_api::clone;
 
 use std::path::PathBuf;
diff --git a/fractal-gtk/src/cache/mod.rs b/fractal-gtk/src/cache/mod.rs
index d93b869f..2355cbdc 100644
--- a/fractal-gtk/src/cache/mod.rs
+++ b/fractal-gtk/src/cache/mod.rs
@@ -1,5 +1,5 @@
-use fractal_api::backend::user;
-use fractal_api::backend::ThreadPool;
+use crate::backend::user;
+use crate::backend::ThreadPool;
 use fractal_api::cache::CacheMap;
 use fractal_api::url::Url;
 use fractal_api::util::ResultExpectLog;
diff --git a/fractal-gtk/src/widgets/address.rs b/fractal-gtk/src/widgets/address.rs
index f9d2901c..3eb09833 100644
--- a/fractal-gtk/src/widgets/address.rs
+++ b/fractal-gtk/src/widgets/address.rs
@@ -1,4 +1,4 @@
-use fractal_api::backend::user;
+use crate::backend::user;
 use fractal_api::r0::AccessToken;
 use fractal_api::r0::Medium;
 use fractal_api::url::Url;
diff --git a/fractal-gtk/src/widgets/image.rs b/fractal-gtk/src/widgets/image.rs
index 99c1192a..5dd5f185 100644
--- a/fractal-gtk/src/widgets/image.rs
+++ b/fractal-gtk/src/widgets/image.rs
@@ -1,5 +1,5 @@
-use fractal_api::backend::media;
-use fractal_api::backend::ThreadPool;
+use crate::backend::media;
+use crate::backend::ThreadPool;
 use fractal_api::url::Url;
 use gdk::prelude::GdkContextExt;
 use gdk_pixbuf::Pixbuf;
diff --git a/fractal-gtk/src/widgets/inline_player.rs b/fractal-gtk/src/widgets/inline_player.rs
index 6084f38b..657af9d7 100644
--- a/fractal-gtk/src/widgets/inline_player.rs
+++ b/fractal-gtk/src/widgets/inline_player.rs
@@ -17,7 +17,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-use fractal_api::backend::{media, ThreadPool};
+use crate::backend::{media, ThreadPool};
 use fractal_api::clone;
 
 use gst::prelude::*;
diff --git a/fractal-gtk/src/widgets/login.rs b/fractal-gtk/src/widgets/login.rs
index dcfeb852..5f97612b 100644
--- a/fractal-gtk/src/widgets/login.rs
+++ b/fractal-gtk/src/widgets/login.rs
@@ -11,7 +11,7 @@ use crate::globals;
 use crate::i18n::i18n;
 use crate::widgets::ErrorDialog;
 
-use fractal_api::backend::register::get_well_known;
+use crate::backend::register::get_well_known;
 
 use std::sync::{Arc, Mutex};
 
diff --git a/fractal-gtk/src/widgets/media_viewer.rs b/fractal-gtk/src/widgets/media_viewer.rs
index 7e24f35f..5e450ca2 100644
--- a/fractal-gtk/src/widgets/media_viewer.rs
+++ b/fractal-gtk/src/widgets/media_viewer.rs
@@ -1,5 +1,5 @@
-use fractal_api::backend::media;
-use fractal_api::backend::ThreadPool;
+use crate::backend::media;
+use crate::backend::ThreadPool;
 use fractal_api::clone;
 use fractal_api::r0::AccessToken;
 
diff --git a/fractal-gtk/src/widgets/message.rs b/fractal-gtk/src/widgets/message.rs
index f5e53bc6..8765ff41 100644
--- a/fractal-gtk/src/widgets/message.rs
+++ b/fractal-gtk/src/widgets/message.rs
@@ -1,8 +1,8 @@
 use crate::i18n::i18n;
 use itertools::Itertools;
 
+use crate::backend::ThreadPool;
 use chrono::prelude::*;
-use fractal_api::backend::ThreadPool;
 use fractal_api::cache::CacheMap;
 use fractal_api::identifiers::UserId;
 use fractal_api::url::Url;
diff --git a/fractal-gtk/src/widgets/room.rs b/fractal-gtk/src/widgets/room.rs
index b57ff1cf..8a62392d 100644
--- a/fractal-gtk/src/widgets/room.rs
+++ b/fractal-gtk/src/widgets/room.rs
@@ -1,6 +1,6 @@
 use crate::i18n::i18n;
 
-use fractal_api::backend::room;
+use crate::backend::room;
 use gtk::prelude::*;
 use std::thread;
 
diff --git a/fractal-gtk/src/widgets/room_history.rs b/fractal-gtk/src/widgets/room_history.rs
index 11c607c7..d1b364c8 100644
--- a/fractal-gtk/src/widgets/room_history.rs
+++ b/fractal-gtk/src/widgets/room_history.rs
@@ -14,10 +14,10 @@ use crate::i18n::i18n;
 use crate::uitypes::MessageContent;
 use crate::uitypes::RowType;
 
+use crate::backend::ThreadPool;
 use crate::globals;
 use crate::widgets;
 use crate::widgets::{PlayerExt, VideoPlayerWidget};
-use fractal_api::backend::ThreadPool;
 use fractal_api::cache::CacheMap;
 use fractal_api::identifiers::{RoomId, UserId};
 use fractal_api::url::Url;
diff --git a/fractal-gtk/src/widgets/room_settings.rs b/fractal-gtk/src/widgets/room_settings.rs
index 56f3e9ed..12407020 100644
--- a/fractal-gtk/src/widgets/room_settings.rs
+++ b/fractal-gtk/src/widgets/room_settings.rs
@@ -1,4 +1,4 @@
-use fractal_api::backend::room;
+use crate::backend::room;
 use fractal_api::clone;
 use fractal_api::identifiers::UserId;
 use fractal_api::r0::AccessToken;
@@ -17,11 +17,11 @@ use crate::app::dispatch_error;
 use crate::app::App;
 use crate::backend::BKResponse;
 use crate::types::Member;
+use crate::types::Room;
 use crate::util::markup_text;
 use crate::widgets;
 use crate::widgets::avatar::AvatarExt;
 use crate::widgets::members_list::MembersList;
-use fractal_api::types::Room;
 
 #[derive(Debug, Clone)]
 pub struct RoomSettings {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]