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

identifiers: Revert serde rename from Cargo.toml

Browse Source
This commit is contained in:
Jonas Platte 2020-10-24 19:27:50 +02:00
parent e1975c2035
commit 64b9c646d1
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
6 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruma-identifiers/Cargo.toml
View File

@ -28,6 +28,7 @@ either = { version = "1.5.3", optional = true }
rand = { version = "0.7.3", optional = true } rand = { version = "0.7.3", optional = true }
ruma-identifiers-macros = { version = "=0.17.4", path = "../ruma-identifiers-macros" } ruma-identifiers-macros = { version = "=0.17.4", path = "../ruma-identifiers-macros" }
ruma-identifiers-validation = { version = "0.1.1", path = "../ruma-identifiers-validation", default-features = false } ruma-identifiers-validation = { version = "0.1.1", path = "../ruma-identifiers-validation", default-features = false }
# Renamed so we can have a serde feature.
serde1 = { package = "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"] } strum = { version = "0.19.2", features = ["derive"] }

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

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

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

@ -9,10 +9,15 @@
)] )]
#![cfg_attr(docsrs, feature(doc_cfg))] #![cfg_attr(docsrs, feature(doc_cfg))]
// Renamed in `Cargo.toml` so we can have a serde feature.
// Rename it back here because `serde1` is ugly.
#[cfg(feature = "serde")]
extern crate serde1 as serde;
use std::convert::TryFrom; use std::convert::TryFrom;
#[cfg(feature = "serde")] #[cfg(feature = "serde")]
use serde1::de::{self, Deserialize as _, Deserializer, Unexpected}; use serde::de::{self, Deserialize as _, Deserializer, Unexpected};
#[doc(inline)] #[doc(inline)]
pub use crate::{ pub use crate::{

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

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

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

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

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

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