From f8630fce818fbb088372e7e83cd6f020a70ba624 Mon Sep 17 00:00:00 2001 From: Ryan Lewis Date: Thu, 3 Mar 2016 20:54:47 +1300 Subject: [PATCH] Update serde to 0.7.0 rename visit_str to serialize_str rename E::syntax(&str) to E::Custom(String) rename deserializer.visit to deserialize.deserialize --- Cargo.toml | 4 ++-- src/datetime.rs | 10 +++++----- src/naive/date.rs | 6 +++--- src/naive/datetime.rs | 6 +++--- src/naive/time.rs | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b901498..f9a5b36 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ name = "chrono" time = "0.1" num = { version = "0.1", default-features = false } rustc-serialize = { version = "0.3", optional = true } -serde = { version = "^0.6.0", optional = true } +serde = { version = "^0.7.0", optional = true } [dev-dependencies] -serde_json = { version = "^0.6.0" } +serde_json = { version = "^0.7.0" } diff --git a/src/datetime.rs b/src/datetime.rs index 51a2ac8..bba3031 100644 --- a/src/datetime.rs +++ b/src/datetime.rs @@ -383,7 +383,7 @@ mod serde { where S: ser::Serializer { // Debug formatting is correct RFC3339, and it allows Zulu. - serializer.visit_str(&format!("{:?}", self)) + serializer.serialize_str(&format!("{:?}", self)) } } @@ -395,7 +395,7 @@ mod serde { fn visit_str(&mut self, value: &str) -> Result, E> where E: de::Error { - value.parse().map_err(|err| E::syntax(&format!("{}", err))) + value.parse().map_err(|err| E::custom(format!("{}", err))) } } @@ -403,7 +403,7 @@ mod serde { fn deserialize(deserializer: &mut D) -> Result where D: de::Deserializer { - deserializer.visit(DateTimeVisitor) + deserializer.deserialize(DateTimeVisitor) } } @@ -411,7 +411,7 @@ mod serde { fn deserialize(deserializer: &mut D) -> Result where D: de::Deserializer { - deserializer.visit(DateTimeVisitor).map(|dt| dt.with_timezone(&UTC)) + deserializer.deserialize(DateTimeVisitor).map(|dt| dt.with_timezone(&UTC)) } } @@ -419,7 +419,7 @@ mod serde { fn deserialize(deserializer: &mut D) -> Result where D: de::Deserializer { - deserializer.visit(DateTimeVisitor).map(|dt| dt.with_timezone(&Local)) + deserializer.deserialize(DateTimeVisitor).map(|dt| dt.with_timezone(&Local)) } } } diff --git a/src/naive/date.rs b/src/naive/date.rs index 8bb29f0..2bcbf03 100644 --- a/src/naive/date.rs +++ b/src/naive/date.rs @@ -1061,7 +1061,7 @@ mod serde { fn serialize(&self, serializer: &mut S) -> Result<(), S::Error> where S: ser::Serializer { - serializer.visit_str(&format!("{:?}", self)) + serializer.serialize_str(&format!("{:?}", self)) } } @@ -1073,7 +1073,7 @@ mod serde { fn visit_str(&mut self, value: &str) -> Result where E: de::Error { - value.parse().map_err(|err| E::syntax(&format!("{}", err))) + value.parse().map_err(|err| E::custom(format!("{}", err))) } } @@ -1081,7 +1081,7 @@ mod serde { fn deserialize(deserializer: &mut D) -> Result where D: de::Deserializer { - deserializer.visit(NaiveDateVisitor) + deserializer.deserialize(NaiveDateVisitor) } } } diff --git a/src/naive/datetime.rs b/src/naive/datetime.rs index 75d7ca4..ab71500 100644 --- a/src/naive/datetime.rs +++ b/src/naive/datetime.rs @@ -324,7 +324,7 @@ mod serde { fn serialize(&self, serializer: &mut S) -> Result<(), S::Error> where S: ser::Serializer { - serializer.visit_str(&format!("{:?}", self)) + serializer.serialize_str(&format!("{:?}", self)) } } @@ -336,7 +336,7 @@ mod serde { fn visit_str(&mut self, value: &str) -> Result where E: de::Error { - value.parse().map_err(|err| E::syntax(&format!("{}", err))) + value.parse().map_err(|err| E::custom(format!("{}", err))) } } @@ -344,7 +344,7 @@ mod serde { fn deserialize(deserializer: &mut D) -> Result where D: de::Deserializer { - deserializer.visit(NaiveDateTimeVisitor) + deserializer.deserialize(NaiveDateTimeVisitor) } } } diff --git a/src/naive/time.rs b/src/naive/time.rs index 07af42a..e4209c7 100644 --- a/src/naive/time.rs +++ b/src/naive/time.rs @@ -583,7 +583,7 @@ mod serde { fn serialize(&self, serializer: &mut S) -> Result<(), S::Error> where S: ser::Serializer { - serializer.visit_str(&format!("{:?}", self)) + serializer.serialize_str(&format!("{:?}", self)) } } @@ -595,7 +595,7 @@ mod serde { fn visit_str(&mut self, value: &str) -> Result where E: de::Error { - value.parse().map_err(|err| E::syntax(&format!("{}", err))) + value.parse().map_err(|err| E::custom(format!("{}", err))) } } @@ -603,7 +603,7 @@ mod serde { fn deserialize(deserializer: &mut D) -> Result where D: de::Deserializer { - deserializer.visit(NaiveTimeVisitor) + deserializer.deserialize(NaiveTimeVisitor) } } }