Bump serde to 1.0

This commit is contained in:
Bastien Orivel 2017-06-14 18:31:09 +02:00 committed by Simon Sapin
parent e1bce24129
commit 76d8573393
60 changed files with 487 additions and 474 deletions

View file

@ -12,9 +12,9 @@ path = "lib.rs"
[dependencies]
heapsize = {version = "0.4"}
heapsize_derive = {version = "0.1"}
serde = {version = "0.9"}
serde_derive = {version = "0.9"}
serde = {version = "1.0"}
serde_derive = {version = "1.0"}
servo_rand = {path = "../rand"}
url = {version = "1.2", features = ["heap_size"]}
url_serde = {version = "0.1.3"}
uuid = {version = "0.4.0", features = ["v4", "serde"]}
url_serde = {version = "0.2"}
uuid = {version = "0.5.0", features = ["v4", "serde"]}

View file

@ -209,9 +209,9 @@ impl serde::Serialize for ServoUrl {
}
}
impl serde::Deserialize for ServoUrl {
impl<'de> serde::Deserialize<'de> for ServoUrl {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where D: serde::Deserializer,
where D: serde::Deserializer<'de>,
{
url_serde::deserialize(deserializer).map(Self::from_url)
}