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

Update serde and serde_json to 1.0.

Browse Source
This commit is contained in:
Jimmy Cuadra 2017-04-20 21:57:36 -07:00
parent a38c7e048c
commit 418c91d5ff
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -14,7 +14,7 @@ version = "0.10.0"
lazy_static = "0.2" lazy_static = "0.2"
rand = "0.3" rand = "0.3"
regex = "0.2" regex = "0.2"
serde = "0.9" serde = "1.0"
url = "1.4" url = "1.4"
[dependencies.diesel] [dependencies.diesel]
@ -22,4 +22,4 @@ optional = true
version = "0.12" version = "0.12"
[dev-dependencies] [dev-dependencies]
serde_json = "0.9" serde_json = "1.0"

40
src/lib.rs
View File

@ -462,33 +462,33 @@ impl Serialize for UserId {
} }
} }
impl Deserialize for EventId { impl<'de> Deserialize<'de> for EventId {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
deserializer.deserialize(EventIdVisitor) deserializer.deserialize_any(EventIdVisitor)
} }
} }
impl Deserialize for RoomAliasId { impl<'de> Deserialize<'de> for RoomAliasId {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
deserializer.deserialize(RoomAliasIdVisitor) deserializer.deserialize_any(RoomAliasIdVisitor)
} }
} }
impl Deserialize for RoomId { impl<'de> Deserialize<'de> for RoomId {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
deserializer.deserialize(RoomIdVisitor) deserializer.deserialize_any(RoomIdVisitor)
} }
} }
impl Deserialize for RoomIdOrAliasId { impl<'de> Deserialize<'de> for RoomIdOrAliasId {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
deserializer.deserialize(RoomIdOrAliasIdVisitor) deserializer.deserialize_any(RoomIdOrAliasIdVisitor)
} }
} }
impl Deserialize for UserId { impl<'de> Deserialize<'de> for UserId {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
deserializer.deserialize(UserIdVisitor) deserializer.deserialize_any(UserIdVisitor)
} }
} }
@ -598,7 +598,7 @@ impl<'a> TryFrom<&'a str> for UserId {
} }
} }
impl Visitor for EventIdVisitor { impl<'de> Visitor<'de> for EventIdVisitor {
type Value = EventId; type Value = EventId;
fn expecting(&self, formatter: &mut Formatter) -> FmtResult { fn expecting(&self, formatter: &mut Formatter) -> FmtResult {
@ -613,7 +613,7 @@ impl Visitor for EventIdVisitor {
} }
} }
impl Visitor for RoomAliasIdVisitor { impl<'de> Visitor<'de> for RoomAliasIdVisitor {
type Value = RoomAliasId; type Value = RoomAliasId;
fn expecting(&self, formatter: &mut Formatter) -> FmtResult { fn expecting(&self, formatter: &mut Formatter) -> FmtResult {
@ -628,7 +628,7 @@ impl Visitor for RoomAliasIdVisitor {
} }
} }
impl Visitor for RoomIdVisitor { impl<'de> Visitor<'de> for RoomIdVisitor {
type Value = RoomId; type Value = RoomId;
fn expecting(&self, formatter: &mut Formatter) -> FmtResult { fn expecting(&self, formatter: &mut Formatter) -> FmtResult {
@ -643,7 +643,7 @@ impl Visitor for RoomIdVisitor {
} }
} }
impl Visitor for RoomIdOrAliasIdVisitor { impl<'de> Visitor<'de> for RoomIdOrAliasIdVisitor {
type Value = RoomIdOrAliasId; type Value = RoomIdOrAliasId;
fn expecting(&self, formatter: &mut Formatter) -> FmtResult { fn expecting(&self, formatter: &mut Formatter) -> FmtResult {
@ -658,7 +658,7 @@ impl Visitor for RoomIdOrAliasIdVisitor {
} }
} }
impl Visitor for UserIdVisitor { impl<'de> Visitor<'de> for UserIdVisitor {
type Value = UserId; type Value = UserId;
fn expecting(&self, formatter: &mut Formatter) -> FmtResult { fn expecting(&self, formatter: &mut Formatter) -> FmtResult {