diff --git a/ruma-serde/Cargo.toml b/ruma-serde/Cargo.toml index 8a000dfa..ab97a49b 100644 --- a/ruma-serde/Cargo.toml +++ b/ruma-serde/Cargo.toml @@ -14,11 +14,11 @@ version = "0.2.2" edition = "2018" [dependencies] +form_urlencoded = "1.0.0" js_int = { version = "0.1.7", features = ["serde"] } itoa = "0.4.6" serde = { version = "1.0.113", features = ["derive"] } serde_json = "1.0.55" -url = "2.1.1" [dev-dependencies] matches = "0.1.8" diff --git a/ruma-serde/src/urlencoded/de.rs b/ruma-serde/src/urlencoded/de.rs index b49378ff..94ef4aef 100644 --- a/ruma-serde/src/urlencoded/de.rs +++ b/ruma-serde/src/urlencoded/de.rs @@ -6,11 +6,11 @@ use std::{ io::Read, }; +use form_urlencoded::{parse, Parse as UrlEncodedParse}; use serde::{ de::{self, value::MapDeserializer, Error as de_Error, IntoDeserializer}, forward_to_deserialize_any, }; -use url::form_urlencoded::{parse, Parse as UrlEncodedParse}; #[doc(inline)] pub use serde::de::value::Error; diff --git a/ruma-serde/src/urlencoded/ser.rs b/ruma-serde/src/urlencoded/ser.rs index 58089d7d..ba46f3d7 100644 --- a/ruma-serde/src/urlencoded/ser.rs +++ b/ruma-serde/src/urlencoded/ser.rs @@ -7,8 +7,8 @@ mod value; use std::{borrow::Cow, error, fmt, str}; +use form_urlencoded::{Serializer as UrlEncodedSerializer, Target as UrlEncodedTarget}; use serde::ser; -use url::form_urlencoded::{Serializer as UrlEncodedSerializer, Target as UrlEncodedTarget}; /// Serializes a value into a `application/x-www-form-urlencoded` `String` buffer. /// diff --git a/ruma-serde/src/urlencoded/ser/pair.rs b/ruma-serde/src/urlencoded/ser/pair.rs index 15be8343..d9b1b577 100644 --- a/ruma-serde/src/urlencoded/ser/pair.rs +++ b/ruma-serde/src/urlencoded/ser/pair.rs @@ -1,7 +1,7 @@ use std::{borrow::Cow, mem}; +use form_urlencoded::{Serializer as UrlEncodedSerializer, Target as UrlEncodedTarget}; use serde::ser; -use url::form_urlencoded::{Serializer as UrlEncodedSerializer, Target as UrlEncodedTarget}; use super::{key::KeySink, part::PartSerializer, value::ValueSink, Error}; diff --git a/ruma-serde/src/urlencoded/ser/value.rs b/ruma-serde/src/urlencoded/ser/value.rs index 3ab373ff..a9f138ef 100644 --- a/ruma-serde/src/urlencoded/ser/value.rs +++ b/ruma-serde/src/urlencoded/ser/value.rs @@ -1,7 +1,7 @@ use std::str; +use form_urlencoded::{Serializer as UrlEncodedSerializer, Target as UrlEncodedTarget}; use serde::ser; -use url::form_urlencoded::{Serializer as UrlEncodedSerializer, Target as UrlEncodedTarget}; use super::{ part::{PartSerializer, Sink}, diff --git a/ruma-serde/tests/url_deserialize.rs b/ruma-serde/tests/url_deserialize.rs index 0a9a9622..2be5fc2e 100644 --- a/ruma-serde/tests/url_deserialize.rs +++ b/ruma-serde/tests/url_deserialize.rs @@ -1,7 +1,7 @@ +use form_urlencoded::Serializer as Encoder; use matches::assert_matches; use ruma_serde::urlencoded; use serde::Deserialize; -use url::form_urlencoded::Serializer as Encoder; #[derive(Deserialize, Debug, PartialEq)] struct NewType(T); diff --git a/ruma-serde/tests/url_serialize.rs b/ruma-serde/tests/url_serialize.rs index e1b7eafb..3813bac0 100644 --- a/ruma-serde/tests/url_serialize.rs +++ b/ruma-serde/tests/url_serialize.rs @@ -1,7 +1,7 @@ +use form_urlencoded::Serializer as Encoder; use matches::assert_matches; use ruma_serde::urlencoded::{self, ser::Error}; use serde::Serialize; -use url::form_urlencoded::Serializer as Encoder; #[derive(Serialize)] struct NewType(T);