[fractal] Remove reqwest dependency
- From: Alexandre Franke <afranke src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal] Remove reqwest dependency
- Date: Tue, 1 Dec 2020 20:22:01 +0000 (UTC)
commit 51d5ac4ea8c70aa8c17d6f58f0a55b0bbf68478c
Author: Alejandro DomÃnguez <adomu net-c com>
Date: Thu Oct 1 11:40:47 2020 +0200
Remove reqwest dependency
Cargo.lock | 1 -
fractal-gtk/Cargo.toml | 4 ----
fractal-gtk/src/api/identity/association/msisdn/submit_token.rs | 6 +++---
fractal-gtk/src/api/r0/account/deactivate.rs | 6 +++---
fractal-gtk/src/api/r0/account/login.rs | 6 +++---
fractal-gtk/src/api/r0/account/logout.rs | 6 +++---
fractal-gtk/src/api/r0/contact/create.rs | 6 +++---
fractal-gtk/src/api/r0/contact/delete.rs | 6 +++---
fractal-gtk/src/api/r0/server/domain_info.rs | 6 +++---
fractal-gtk/src/client.rs | 3 ++-
10 files changed, 23 insertions(+), 27 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index 572e0868..f6b306fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -811,7 +811,6 @@ dependencies = [
"pango",
"rand 0.7.3",
"regex",
- "reqwest",
"secret-service",
"serde",
"serde_json",
diff --git a/fractal-gtk/Cargo.toml b/fractal-gtk/Cargo.toml
index 6a8ed178..04b2b674 100644
--- a/fractal-gtk/Cargo.toml
+++ b/fractal-gtk/Cargo.toml
@@ -79,10 +79,6 @@ features = ["serde_untagged"]
version = "0.2.22"
features = ["rt-threaded", "time"]
-[dependencies.reqwest]
-version = "0.10.3"
-features = ["socks"]
-
[dependencies.url]
version = "2.1.1"
features = ["serde"]
diff --git a/fractal-gtk/src/api/identity/association/msisdn/submit_token.rs
b/fractal-gtk/src/api/identity/association/msisdn/submit_token.rs
index b6de10ed..5ed4ddf9 100644
--- a/fractal-gtk/src/api/identity/association/msisdn/submit_token.rs
+++ b/fractal-gtk/src/api/identity/association/msisdn/submit_token.rs
@@ -1,6 +1,6 @@
-use reqwest::Client;
-use reqwest::Error;
-use reqwest::Request;
+use matrix_sdk::reqwest::Client;
+use matrix_sdk::reqwest::Error;
+use matrix_sdk::reqwest::Request;
use serde::{Deserialize, Serialize};
use url::Url;
diff --git a/fractal-gtk/src/api/r0/account/deactivate.rs b/fractal-gtk/src/api/r0/account/deactivate.rs
index 2dd9ef1e..764a4b70 100644
--- a/fractal-gtk/src/api/r0/account/deactivate.rs
+++ b/fractal-gtk/src/api/r0/account/deactivate.rs
@@ -1,8 +1,8 @@
use super::AuthenticationData;
use crate::api::r0::AccessToken;
-use reqwest::Client;
-use reqwest::Error;
-use reqwest::Request;
+use matrix_sdk::reqwest::Client;
+use matrix_sdk::reqwest::Error;
+use matrix_sdk::reqwest::Request;
use serde::Serialize;
use url::Url;
diff --git a/fractal-gtk/src/api/r0/account/login.rs b/fractal-gtk/src/api/r0/account/login.rs
index adeb889b..79ce94e2 100644
--- a/fractal-gtk/src/api/r0/account/login.rs
+++ b/fractal-gtk/src/api/r0/account/login.rs
@@ -2,9 +2,9 @@ use super::Identifier;
use crate::api::r0::AccessToken;
use matrix_sdk::identifiers::DeviceId;
use matrix_sdk::identifiers::UserId;
-use reqwest::Client;
-use reqwest::Error;
-use reqwest::Request;
+use matrix_sdk::reqwest::Client;
+use matrix_sdk::reqwest::Error;
+use matrix_sdk::reqwest::Request;
use serde::{Deserialize, Serialize};
use url::Url;
diff --git a/fractal-gtk/src/api/r0/account/logout.rs b/fractal-gtk/src/api/r0/account/logout.rs
index 4b13bd62..07d9a33e 100644
--- a/fractal-gtk/src/api/r0/account/logout.rs
+++ b/fractal-gtk/src/api/r0/account/logout.rs
@@ -1,7 +1,7 @@
use crate::api::r0::AccessToken;
-use reqwest::Client;
-use reqwest::Error;
-use reqwest::Request;
+use matrix_sdk::reqwest::Client;
+use matrix_sdk::reqwest::Error;
+use matrix_sdk::reqwest::Request;
use serde::Serialize;
use url::Url;
diff --git a/fractal-gtk/src/api/r0/contact/create.rs b/fractal-gtk/src/api/r0/contact/create.rs
index df825247..7dfec07f 100644
--- a/fractal-gtk/src/api/r0/contact/create.rs
+++ b/fractal-gtk/src/api/r0/contact/create.rs
@@ -1,8 +1,8 @@
use crate::api::r0::AccessToken;
use crate::api::r0::ThreePIDCredentials;
-use reqwest::Client;
-use reqwest::Error;
-use reqwest::Request;
+use matrix_sdk::reqwest::Client;
+use matrix_sdk::reqwest::Error;
+use matrix_sdk::reqwest::Request;
use serde::Serialize;
use std::ops::Not;
use url::Url;
diff --git a/fractal-gtk/src/api/r0/contact/delete.rs b/fractal-gtk/src/api/r0/contact/delete.rs
index b9ab8d7b..fb98b0bc 100644
--- a/fractal-gtk/src/api/r0/contact/delete.rs
+++ b/fractal-gtk/src/api/r0/contact/delete.rs
@@ -1,8 +1,8 @@
use crate::api::r0::AccessToken;
use crate::api::r0::Medium;
-use reqwest::Client;
-use reqwest::Error;
-use reqwest::Request;
+use matrix_sdk::reqwest::Client;
+use matrix_sdk::reqwest::Error;
+use matrix_sdk::reqwest::Request;
use serde::Serialize;
use url::Url;
diff --git a/fractal-gtk/src/api/r0/server/domain_info.rs b/fractal-gtk/src/api/r0/server/domain_info.rs
index 155d8d43..97d8caae 100644
--- a/fractal-gtk/src/api/r0/server/domain_info.rs
+++ b/fractal-gtk/src/api/r0/server/domain_info.rs
@@ -1,6 +1,6 @@
-use reqwest::Client;
-use reqwest::Error;
-use reqwest::Request;
+use matrix_sdk::reqwest::Client;
+use matrix_sdk::reqwest::Error;
+use matrix_sdk::reqwest::Request;
use serde::Deserialize;
use url::Url;
diff --git a/fractal-gtk/src/client.rs b/fractal-gtk/src/client.rs
index c918172e..b606a697 100644
--- a/fractal-gtk/src/client.rs
+++ b/fractal-gtk/src/client.rs
@@ -4,7 +4,8 @@ use async_trait::async_trait;
use gio::prelude::*;
use matrix_sdk::{
- Client as MatrixClient, ClientConfig as MatrixClientConfig, Error as MatrixSdkError, HttpSend,
+ reqwest, Client as MatrixClient, ClientConfig as MatrixClientConfig, Error as MatrixSdkError,
+ HttpSend,
};
use url::Url;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]