chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename serde dependency in ruma-identifiers

Browse Source 
to be able to make the serde feature activate
ruma-identifiers-validation's serde feature
This commit is contained in:
Jonas Platte 2020-08-08 18:15:35 +02:00
parent 67154e2c31
commit 0f3478bf90
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
7 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruma-identifiers/CHANGELOG.md
View File

@ -3,6 +3,8 @@
Bug fixes:
* Fix key algorithm serde (de)serialization
* Fix `key_algorithms::{DeviceKeyAlgorithm, ServerKeyAlgorithm}` not implementing `Deserialize` and
`Serialize` with `default-features = false` + `features = ["serde", …]`
Breaking changes:

5
ruma-identifiers/Cargo.toml
View File

@ -20,14 +20,15 @@ all-features = true
rustdoc-args = ["--cfg", "docsrs"]
[features]
default = ["serde", "ruma-identifiers-validation/serde"]
default = ["serde"]
serde = ["serde1", "ruma-identifiers-validation/serde"]
[dependencies]
either = { version = "1.5.3", optional = true }
rand = { version = "0.7.3", optional = true }
ruma-identifiers-macros = { version = "=0.17.3", path = "../ruma-identifiers-macros" }
ruma-identifiers-validation = { version = "0.1.1", path = "../ruma-identifiers-validation" }
serde = { version = "1.0.114", optional = true, features = ["derive"] }
serde1 = { package = "serde", version = "1.0.114", optional = true, features = ["derive"] }
strum = { version = "0.19.2", features = ["derive"] }
[dev-dependencies]

6
ruma-identifiers/src/device_id.rs
View File

@ -14,7 +14,7 @@ use crate::generate_localpart;
/// provided simply for its semantic value.
#[repr(transparent)]
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize), serde(transparent))]
#[cfg_attr(feature = "serde", derive(serde1::Serialize), serde(transparent, crate = "serde1"))]
pub struct DeviceId(str);
impl DeviceId {
@ -112,10 +112,10 @@ impl Display for DeviceId {
}
#[cfg(feature = "serde")]
impl<'de> serde::Deserialize<'de> for Box<DeviceId> {
impl<'de> serde1::Deserialize<'de> for Box<DeviceId> {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
D: serde1::Deserializer<'de>,
{
crate::deserialize_id(deserializer, "An IP address or hostname")
}

2
ruma-identifiers/src/lib.rs
View File

@ -12,7 +12,7 @@
use std::convert::TryFrom;
#[cfg(feature = "serde")]
use serde::de::{self, Deserialize as _, Deserializer, Unexpected};
use serde1::de::{self, Deserialize as _, Deserializer, Unexpected};
#[doc(inline)]
pub use crate::{

12
ruma-identifiers/src/macros.rs
View File

@ -102,21 +102,21 @@ macro_rules! common_impls {
}
}
#[cfg(feature = "serde")]
impl ::serde::Serialize for $id {
#[cfg(feature = "serde1")]
impl ::serde1::Serialize for $id {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: ::serde::Serializer,
S: ::serde1::Serializer,
{
serializer.serialize_str(self.as_str())
}
}
#[cfg(feature = "serde")]
impl<'de> ::serde::Deserialize<'de> for $id {
#[cfg(feature = "serde1")]
impl<'de> ::serde1::Deserialize<'de> for $id {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: ::serde::Deserializer<'de>,
D: ::serde1::Deserializer<'de>,
{
crate::deserialize_id(deserializer, $desc)
}

2
ruma-identifiers/src/room_version_id.rs
View File

@ -7,7 +7,7 @@ use std::{
};
#[cfg(feature = "serde")]
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use serde1::{Deserialize, Deserializer, Serialize, Serializer};
use crate::Error;

6
ruma-identifiers/src/server_name.rs
View File

@ -13,7 +13,7 @@ use crate::Error;
/// A Matrix-spec compliant server name.
#[repr(transparent)]
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize), serde(transparent))]
#[cfg_attr(feature = "serde", derive(serde1::Serialize), serde(transparent, crate = "serde1"))]
pub struct ServerName(str);
impl ServerName {
@ -119,10 +119,10 @@ impl Display for ServerName {
}
#[cfg(feature = "serde")]
impl<'de> serde::Deserialize<'de> for Box<ServerName> {
impl<'de> serde1::Deserialize<'de> for Box<ServerName> {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
D: serde1::Deserializer<'de>,
{
crate::deserialize_id(deserializer, "An IP address or hostname")
}