GNOME.org
 

[fractal] fractal-gtk: Depend on url crate through fractal-matrix-api

commit ed27186dc4d6eef9673712b32d4401c3297fcef5
Author: Alejandro Domínguez <adomu net-c com>
Date:   Fri Feb 7 01:28:45 2020 +0100

    fractal-gtk: Depend on url crate through fractal-matrix-api

 Cargo.lock                                  | 1 -
 fractal-gtk/Cargo.toml                      | 1 -
 fractal-gtk/src/actions/account_settings.rs | 2 +-
 fractal-gtk/src/actions/room_history.rs     | 2 +-
 fractal-gtk/src/actions/room_settings.rs    | 2 +-
 fractal-gtk/src/appop/login.rs              | 2 +-
 fractal-gtk/src/appop/mod.rs                | 2 +-
 fractal-gtk/src/appop/room.rs               | 2 +-
 fractal-gtk/src/cache/mod.rs                | 2 +-
 fractal-gtk/src/globals.rs                  | 2 +-
 fractal-gtk/src/passwd.rs                   | 6 +++---
 fractal-gtk/src/widgets/address.rs          | 2 +-
 fractal-gtk/src/widgets/image.rs            | 2 +-
 fractal-gtk/src/widgets/inline_player.rs    | 2 +-
 fractal-gtk/src/widgets/login.rs            | 2 +-
 fractal-gtk/src/widgets/media_viewer.rs     | 2 +-
 fractal-gtk/src/widgets/message.rs          | 2 +-
 fractal-gtk/src/widgets/room_history.rs     | 2 +-
 fractal-gtk/src/widgets/room_settings.rs    | 2 +-
 fractal-gtk/src/widgets/roomlist.rs         | 2 +-
 fractal-matrix-api/src/lib.rs               | 1 +
 21 files changed, 21 insertions(+), 22 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index 82b3debd..59e880d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -580,7 +580,6 @@ dependencies = [
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "sourceview4 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
diff --git a/fractal-gtk/Cargo.toml b/fractal-gtk/Cargo.toml
index ca411ac1..b61baaf4 100644
--- a/fractal-gtk/Cargo.toml
+++ b/fractal-gtk/Cargo.toml
@@ -32,7 +32,6 @@ regex = "1.1.0"
 secret-service = "1.0.0"
 serde_json = "1.0.33"
 sourceview4 = "0.1.0"
-url = "1.7.2"
 
 [dependencies.gst]
 version = "0.14.0"
diff --git a/fractal-gtk/src/actions/account_settings.rs b/fractal-gtk/src/actions/account_settings.rs
index 05ed2157..e37f07cf 100644
--- a/fractal-gtk/src/actions/account_settings.rs
+++ b/fractal-gtk/src/actions/account_settings.rs
@@ -1,12 +1,12 @@
 use crate::i18n::i18n;
 use fractal_api::r0::AccessToken;
+use fractal_api::url::Url;
 use gio::prelude::*;
 use gio::SimpleAction;
 use gio::SimpleActionGroup;
 use gtk;
 use gtk::prelude::*;
 use std::sync::mpsc::Sender;
-use url::Url;
 
 use crate::backend::BKCommand;
 
diff --git a/fractal-gtk/src/actions/room_history.rs b/fractal-gtk/src/actions/room_history.rs
index be96f2e3..1308ff63 100644
--- a/fractal-gtk/src/actions/room_history.rs
+++ b/fractal-gtk/src/actions/room_history.rs
@@ -12,12 +12,12 @@ use crate::i18n::i18n;
 use crate::types::Message;
 use crate::uibuilder::UI;
 use crate::App;
+use fractal_api::url::Url;
 use gio::ActionMapExt;
 use gio::SimpleAction;
 use gio::SimpleActionGroup;
 use gtk;
 use gtk::prelude::*;
-use url::Url;
 
 use crate::widgets::ErrorDialog;
 use crate::widgets::FileDialog::save;
diff --git a/fractal-gtk/src/actions/room_settings.rs b/fractal-gtk/src/actions/room_settings.rs
index 40bb73a3..eaac18c4 100644
--- a/fractal-gtk/src/actions/room_settings.rs
+++ b/fractal-gtk/src/actions/room_settings.rs
@@ -1,4 +1,5 @@
 use fractal_api::r0::AccessToken;
+use fractal_api::url::Url;
 use gio::prelude::*;
 use gio::SimpleAction;
 use gio::SimpleActionGroup;
@@ -6,7 +7,6 @@ use glib;
 use gtk;
 use gtk::prelude::*;
 use std::sync::mpsc::Sender;
-use url::Url;
 
 use crate::backend::BKCommand;
 use crate::i18n::i18n;
diff --git a/fractal-gtk/src/appop/login.rs b/fractal-gtk/src/appop/login.rs
index 8d4a9485..98394540 100644
--- a/fractal-gtk/src/appop/login.rs
+++ b/fractal-gtk/src/appop/login.rs
@@ -2,7 +2,7 @@ use log::error;
 
 use fractal_api::r0::AccessToken;
 
-use url::Url;
+use fractal_api::url::Url;
 
 use crate::appop::AppOp;
 
diff --git a/fractal-gtk/src/appop/mod.rs b/fractal-gtk/src/appop/mod.rs
index 6d6ec410..82168aaf 100644
--- a/fractal-gtk/src/appop/mod.rs
+++ b/fractal-gtk/src/appop/mod.rs
@@ -8,7 +8,7 @@ use fractal_api::r0::AccessToken;
 use gtk;
 use gtk::prelude::*;
 
-use url::Url;
+use fractal_api::url::Url;
 
 use crate::backend;
 use crate::backend::BKCommand;
diff --git a/fractal-gtk/src/appop/room.rs b/fractal-gtk/src/appop/room.rs
index 0979ecb4..b2cb88b9 100644
--- a/fractal-gtk/src/appop/room.rs
+++ b/fractal-gtk/src/appop/room.rs
@@ -1,8 +1,8 @@
 use crate::i18n::{i18n, i18n_k, ni18n_f};
+use fractal_api::url::Url;
 use log::{error, warn};
 use std::fs::remove_file;
 use std::os::unix::fs;
-use url::Url;
 
 use gtk;
 use gtk::prelude::*;
diff --git a/fractal-gtk/src/cache/mod.rs b/fractal-gtk/src/cache/mod.rs
index bd7e8a4f..1bbc22f0 100644
--- a/fractal-gtk/src/cache/mod.rs
+++ b/fractal-gtk/src/cache/mod.rs
@@ -1,7 +1,7 @@
+use fractal_api::url::Url;
 use gtk;
 use gtk::LabelExt;
 use serde::{Deserialize, Serialize};
-use url::Url;
 
 use crate::types::Room;
 use crate::types::RoomList;
diff --git a/fractal-gtk/src/globals.rs b/fractal-gtk/src/globals.rs
index 142401ba..22fc6135 100644
--- a/fractal-gtk/src/globals.rs
+++ b/fractal-gtk/src/globals.rs
@@ -1,5 +1,5 @@
+use fractal_api::url::Url;
 use lazy_static::lazy_static;
-use url::Url;
 
 pub static CACHE_SIZE: usize = 40;
 pub static MSG_ICON_SIZE: i32 = 40;
diff --git a/fractal-gtk/src/passwd.rs b/fractal-gtk/src/passwd.rs
index e7448066..0428e84b 100644
--- a/fractal-gtk/src/passwd.rs
+++ b/fractal-gtk/src/passwd.rs
@@ -1,8 +1,8 @@
 use fractal_api::derror;
 use fractal_api::r0::AccessToken;
+use fractal_api::url::ParseError;
+use fractal_api::url::Url;
 use secret_service;
-use url::ParseError;
-use url::Url;
 
 #[derive(Debug)]
 pub enum Error {
@@ -49,7 +49,7 @@ pub trait PasswordStorage {
 mod ss_storage {
     use super::Error;
     use fractal_api::r0::AccessToken;
-    use url::Url;
+    use fractal_api::url::Url;
 
     use super::secret_service::EncryptionType;
     use super::secret_service::SecretService;
diff --git a/fractal-gtk/src/widgets/address.rs b/fractal-gtk/src/widgets/address.rs
index 3c852eb9..b7b7e60c 100644
--- a/fractal-gtk/src/widgets/address.rs
+++ b/fractal-gtk/src/widgets/address.rs
@@ -1,12 +1,12 @@
 use fractal_api::r0::AccessToken;
 use fractal_api::r0::Medium;
+use fractal_api::url::Url;
 use glib::signal;
 use gtk;
 use gtk::prelude::*;
 use rand::distributions::Alphanumeric;
 use rand::{thread_rng, Rng};
 use std::sync::mpsc::Sender;
-use url::Url;
 
 use crate::appop::AppOp;
 use crate::backend::BKCommand;
diff --git a/fractal-gtk/src/widgets/image.rs b/fractal-gtk/src/widgets/image.rs
index c9e004eb..3a83062b 100644
--- a/fractal-gtk/src/widgets/image.rs
+++ b/fractal-gtk/src/widgets/image.rs
@@ -1,3 +1,4 @@
+use fractal_api::url::Url;
 use gdk::ContextExt;
 use gdk_pixbuf;
 use gdk_pixbuf::Pixbuf;
@@ -13,7 +14,6 @@ use std::path::Path;
 use std::sync::mpsc::channel;
 use std::sync::mpsc::{Receiver, Sender};
 use std::sync::{Arc, Mutex};
-use url::Url;
 
 use crate::backend::BKCommand;
 use crate::error::Error;
diff --git a/fractal-gtk/src/widgets/inline_player.rs b/fractal-gtk/src/widgets/inline_player.rs
index ef498859..77370046 100644
--- a/fractal-gtk/src/widgets/inline_player.rs
+++ b/fractal-gtk/src/widgets/inline_player.rs
@@ -42,7 +42,7 @@ use std::sync::mpsc::channel;
 use std::sync::mpsc::TryRecvError;
 use std::sync::mpsc::{Receiver, Sender};
 
-use url::Url;
+use fractal_api::url::Url;
 
 use crate::app::App;
 use crate::backend::BKCommand;
diff --git a/fractal-gtk/src/widgets/login.rs b/fractal-gtk/src/widgets/login.rs
index 6491e167..f9fb75ef 100644
--- a/fractal-gtk/src/widgets/login.rs
+++ b/fractal-gtk/src/widgets/login.rs
@@ -1,7 +1,7 @@
+use fractal_api::url::Url;
 use gio::prelude::*;
 use gtk::prelude::*;
 use log::info;
-use url::Url;
 
 use crate::actions;
 use crate::actions::global::AppState;
diff --git a/fractal-gtk/src/widgets/media_viewer.rs b/fractal-gtk/src/widgets/media_viewer.rs
index f191ca50..84226789 100644
--- a/fractal-gtk/src/widgets/media_viewer.rs
+++ b/fractal-gtk/src/widgets/media_viewer.rs
@@ -8,6 +8,7 @@ use std::rc::Rc;
 
 use crate::i18n::i18n;
 use dirs;
+use fractal_api::url::Url;
 use gdk::*;
 use glib;
 use glib::signal;
@@ -15,7 +16,6 @@ use gtk;
 use gtk::prelude::*;
 use gtk::Overlay;
 use gtk::ResponseType;
-use url::Url;
 
 use crate::types::Message;
 use crate::types::Room;
diff --git a/fractal-gtk/src/widgets/message.rs b/fractal-gtk/src/widgets/message.rs
index c569e17c..12818320 100644
--- a/fractal-gtk/src/widgets/message.rs
+++ b/fractal-gtk/src/widgets/message.rs
@@ -2,6 +2,7 @@ use crate::i18n::i18n;
 use itertools::Itertools;
 
 use chrono::prelude::*;
+use fractal_api::url::Url;
 use glib;
 use gtk;
 use gtk::{prelude::*, ButtonExt, ContainerExt, Overlay, WidgetExt};
@@ -9,7 +10,6 @@ use pango;
 use std::cmp::max;
 use std::rc::Rc;
 use std::sync::mpsc::Sender;
-use url::Url;
 
 use crate::backend::BKCommand;
 
diff --git a/fractal-gtk/src/widgets/room_history.rs b/fractal-gtk/src/widgets/room_history.rs
index 46b54866..911c25b4 100644
--- a/fractal-gtk/src/widgets/room_history.rs
+++ b/fractal-gtk/src/widgets/room_history.rs
@@ -18,6 +18,7 @@ use crate::uitypes::RowType;
 use crate::globals;
 use crate::widgets;
 use crate::widgets::{PlayerExt, VideoPlayerWidget};
+use fractal_api::url::Url;
 use gio::ActionMapExt;
 use gio::SimpleActionGroup;
 use glib::source;
@@ -25,7 +26,6 @@ use glib::SignalHandlerId;
 use glib::Source;
 use gtk;
 use gtk::prelude::*;
-use url::Url;
 
 struct List {
     list: VecDeque<Element>,
diff --git a/fractal-gtk/src/widgets/room_settings.rs b/fractal-gtk/src/widgets/room_settings.rs
index 48d8baee..10891fe0 100644
--- a/fractal-gtk/src/widgets/room_settings.rs
+++ b/fractal-gtk/src/widgets/room_settings.rs
@@ -5,10 +5,10 @@ use std::rc::Rc;
 use std::sync::mpsc::Sender;
 
 use crate::i18n::ni18n_f;
+use fractal_api::url::Url;
 use gio::prelude::*;
 use gtk;
 use gtk::prelude::*;
-use url::Url;
 
 use crate::actions;
 use crate::actions::{ButtonState, StateExt};
diff --git a/fractal-gtk/src/widgets/roomlist.rs b/fractal-gtk/src/widgets/roomlist.rs
index f5453ad6..86d637af 100644
--- a/fractal-gtk/src/widgets/roomlist.rs
+++ b/fractal-gtk/src/widgets/roomlist.rs
@@ -5,10 +5,10 @@ use gdk;
 use glib;
 use pango;
 
+use fractal_api::url::Url;
 use gtk;
 use gtk::prelude::*;
 use std::collections::HashMap;
-use url::Url;
 
 use crate::globals;
 use crate::types::{Room, RoomTag};
diff --git a/fractal-matrix-api/src/lib.rs b/fractal-matrix-api/src/lib.rs
index 9b44521b..c73ed8c0 100644
--- a/fractal-matrix-api/src/lib.rs
+++ b/fractal-matrix-api/src/lib.rs
@@ -13,6 +13,7 @@ mod serde;
 pub mod types;
 
 pub use ruma_identifiers as identifiers;
+pub use url;
 
 #[cfg(test)]
 mod tests {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]