diff options
| author | Bastien Orivel <eijebong@bananium.fr> | 2017-06-14 18:31:09 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-06-16 13:31:18 +0200 |
| commit | 76d8573393b9e31739b633a6a4b2b77efbf12abf (patch) | |
| tree | f989ac999588eaacc735a3b0ec0c0350e926a4d4 /components/url | |
| parent | e1bce241291683ee61abab042d0c808ae5396e91 (diff) | |
| download | servo-76d8573393b9e31739b633a6a4b2b77efbf12abf.tar.gz servo-76d8573393b9e31739b633a6a4b2b77efbf12abf.zip | |
Bump serde to 1.0
Diffstat (limited to 'components/url')
| -rw-r--r-- | components/url/Cargo.toml | 8 | ||||
| -rw-r--r-- | components/url/lib.rs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/components/url/Cargo.toml b/components/url/Cargo.toml index 42b6cc63150..1f3d2428449 100644 --- a/components/url/Cargo.toml +++ b/components/url/Cargo.toml @@ -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"]} diff --git a/components/url/lib.rs b/components/url/lib.rs index d3ae836bb74..0df3b92fb90 100644 --- a/components/url/lib.rs +++ b/components/url/lib.rs @@ -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) } |