Auto merge of #190 - servo:serdeup, r=SimonSapin

Update to serde 1.0

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/string-cache/190)
<!-- Reviewable:end -->

Author: bors-servo

Cargo.toml

@@ -30,7 +30,7 @@ unstable = []
 [dependencies]
 precomputed-hash = "0.1"
 lazy_static = "0.2"
-serde = "0.9"
+serde = "1"
 phf_shared = "0.7.4"
 debug_unreachable = "0.1.1"
 heapsize = { version = ">= 0.3, < 0.5", optional = true }

src/atom.rs

@@ -458,8 +458,8 @@ impl<Static: StaticAtomSet> Serialize for Atom<Static> {
     }
 }
 
-impl<Static: StaticAtomSet> Deserialize for Atom<Static> {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
+impl<'a, Static: StaticAtomSet> Deserialize<'a> for Atom<Static> {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'a> {
         let string: String = try!(Deserialize::deserialize(deserializer));
         Ok(Atom::from(string))
     }