Update for rustc 1.0.0-nightly (8903c21d6 2015-01-15 22:42:58 +0000)

serde2/src/bin.rs

@@ -357,7 +357,7 @@ pub fn main() {
     let mut state = MyDeserializer::new(tokens.into_iter());
 
     let v: Result<Vec<int>, Error> = Deserialize::deserialize(&mut state);
-    println!("vec:           {}", v);
+    println!("vec:           {:?}", v);
 
     ////
 
@@ -370,7 +370,7 @@ pub fn main() {
     let mut state = MyDeserializer::new(tokens.into_iter());
 
     let v: Result<(int, int), Error> = Deserialize::deserialize(&mut state);
-    println!("tuple:         {}", v);
+    println!("tuple:         {:?}", v);
 
     ////
 
@@ -383,7 +383,7 @@ pub fn main() {
     let mut state = MyDeserializer::new(tokens.into_iter());
 
     let v: Result<json::Value, Error> = Deserialize::deserialize(&mut state);
-    println!("value:         {}", v);
+    println!("value:         {:?}", v);
 
     ////
 
@@ -394,7 +394,7 @@ pub fn main() {
     let mut state = MyDeserializer::new(tokens.into_iter());
 
     let v: Result<option::Option<int>, Error> = Deserialize::deserialize(&mut state);
-    println!("optiony:       {}", v);
+    println!("optiony:       {:?}", v);
 
     ////
 
@@ -404,7 +404,7 @@ pub fn main() {
     let mut state = MyDeserializer::new(tokens.into_iter());
 
     let v: Result<option::Option<int>, Error> = Deserialize::deserialize(&mut state);
-    println!("optiony:       {}", v);
+    println!("optiony:       {:?}", v);
 
     ////
 
@@ -415,7 +415,7 @@ pub fn main() {
     let mut state = MyDeserializer::new(tokens.into_iter());
 
     let v: Result<json::Value, Error> = Deserialize::deserialize(&mut state);
-    println!("optiony value: {}", v);
+    println!("optiony value: {:?}", v);
 
     ////
 
@@ -425,7 +425,7 @@ pub fn main() {
     let mut state = MyDeserializer::new(tokens.into_iter());
 
     let v: Result<json::Value, Error> = Deserialize::deserialize(&mut state);
-    println!("optiony value: {}", v);
+    println!("optiony value: {:?}", v);
 
     ////
 
@@ -435,7 +435,7 @@ pub fn main() {
     let mut state = MyDeserializer::new(tokens.into_iter());
 
     let v: Result<option::Option<int>, Error> = Deserialize::deserialize(&mut state);
-    println!("option:        {}", v);
+    println!("option:        {:?}", v);
 
     ////
 
@@ -445,7 +445,7 @@ pub fn main() {
     let mut state = MyDeserializer::new(tokens.into_iter());
 
     let v: Result<option::Option<int>, Error> = Deserialize::deserialize(&mut state);
-    println!("option:        {}", v);
+    println!("option:        {:?}", v);
 
     ////
 
@@ -455,7 +455,7 @@ pub fn main() {
     let mut state = MyDeserializer::new(tokens.into_iter());
 
     let v: Result<json::Value, Error> = Deserialize::deserialize(&mut state);
-    println!("option value:  {}", v);
+    println!("option value:  {:?}", v);
 
     ////
 
@@ -465,7 +465,7 @@ pub fn main() {
     let mut state = MyDeserializer::new(tokens.into_iter());
 
     let v: Result<json::Value, Error> = Deserialize::deserialize(&mut state);
-    println!("option value:  {}", v);
+    println!("option value:  {:?}", v);
 
     ////
 
@@ -480,7 +480,7 @@ pub fn main() {
     let mut state = MyDeserializer::new(tokens.into_iter());
 
     let v: Result<HashMap<string::String, int>, Error> = Deserialize::deserialize(&mut state);
-    println!("{}", v);
+    println!("{:?}", v);
 
     ////
 
@@ -495,7 +495,7 @@ pub fn main() {
     let mut state = MyDeserializer::new(tokens.into_iter());
 
     let v: Result<json::Value, Error> = Deserialize::deserialize(&mut state);
-    println!("{}", v);
+    println!("{:?}", v);
 }
 
 
@@ -560,9 +560,9 @@ fn main() {
 
     let mut s = GatherTokens::new();
     value.serialize(&mut s);
-    println!("tokens: {}", s.unwrap());
+    println!("tokens: {:?}", s.unwrap());
 
-    println!("json:   {}", json::to_string(&value).unwrap().unwrap());
+    println!("json:   {:?}", json::to_string(&value).unwrap().unwrap());
     println!("");
 
     ////
@@ -571,9 +571,9 @@ fn main() {
 
     let mut s = GatherTokens::new();
     value.serialize(&mut s);
-    println!("tokens: {}", s.unwrap());
+    println!("tokens: {:?}", s.unwrap());
 
-    println!("json:   {}", json::to_string(&value).unwrap().unwrap());
+    println!("json:   {:?}", json::to_string(&value).unwrap().unwrap());
     println!("");
 
     ////
@@ -585,25 +585,25 @@ fn main() {
 
     let mut s = GatherTokens::new();
     value.serialize(&mut s);
-    println!("tokens: {}", s.unwrap());
+    println!("tokens: {:?}", s.unwrap());
 
-    println!("json:   {}", json::to_string(&value).unwrap().unwrap());
+    println!("json:   {:?}", json::to_string(&value).unwrap().unwrap());
     println!("");
 
     ////
 
     /*
-    println!("{}", to_format_vec(&5i));
-    println!("{}", to_format_string(&5i));
+    println!("{:?}", to_format_vec(&5i));
+    println!("{:?}", to_format_string(&5i));
     */
 
     let value = Foo { x: 1, y: 2, z: "abc" };
 
     let mut s = GatherTokens::new();
     value.serialize(&mut s);
-    println!("tokens: {}", s.unwrap());
+    println!("tokens: {:?}", s.unwrap());
 
-    println!("json:   {}", json::to_string(&value).unwrap().unwrap());
+    println!("json:   {:?}", json::to_string(&value).unwrap().unwrap());
     println!("");
 
     ////
@@ -612,9 +612,9 @@ fn main() {
 
     let mut s = GatherTokens::new();
     value.serialize(&mut s);
-    println!("tokens: {}", s.unwrap());
+    println!("tokens: {:?}", s.unwrap());
 
-    println!("json:   {}", json::to_string(&value).unwrap().unwrap());
+    println!("json:   {:?}", json::to_string(&value).unwrap().unwrap());
     println!("");
 }
 */

serde2/src/de.rs

@@ -1,4 +1,5 @@
 use std::collections::{HashMap, BTreeMap};
+use std::collections::hash_map::Hasher;
 use std::hash::Hash;
 use std::num::FromPrimitive;
 
@@ -429,7 +430,7 @@ impl_deserialize_tuple! { T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, }
 ///////////////////////////////////////////////////////////////////////////////
 
 impl<
-    K: Deserialize<S, E> + Eq + Hash,
+    K: Deserialize<S, E> + Eq + Hash<Hasher>,
     V: Deserialize<S, E>,
     S: Deserializer<E>,
     E: Error,
@@ -438,7 +439,7 @@ impl<
         struct Visitor;
 
         impl<
-            K: Deserialize<S, E> + Eq + Hash,
+            K: Deserialize<S, E> + Eq + Hash<Hasher>,
             V: Deserialize<S, E>,
             S: Deserializer<E>,
             E: Error,

serde2/src/json/error.rs

@@ -103,7 +103,7 @@ impl error::Error for Error {
     fn detail(&self) -> Option<String> {
         match *self {
             Error::SyntaxError(ref code, line, col) => {
-                Some(format!("{} at line {} column {}", code, line, col))
+                Some(format!("{:?} at line {:?} column {:?}", code, line, col))
             }
             Error::IoError(ref error) => error.detail(),
             /*

serde2/src/ser.rs

@@ -473,8 +473,8 @@ impl<
 > MapVisitor<S, R, E> for MapIteratorVisitor<Iter> {
     #[inline]
     fn visit<
-        V: Visitor<S, R, E>,
-    >(&mut self, state: &mut S, visitor: V) -> Result<Option<R>, E> {
+        VS: Visitor<S, R, E>,
+    >(&mut self, state: &mut S, visitor: VS) -> Result<Option<R>, E> {
         let first = self.first;
         self.first = false;
 
@@ -504,8 +504,8 @@ impl<
         S,
         R,
         E,
-        V: Visitor<S, R, E>,
-    >(&self, state: &mut S, visitor: V) -> Result<R, E> {
+        VS: Visitor<S, R, E>,
+    >(&self, state: &mut S, visitor: VS) -> Result<R, E> {
         visitor.visit_map(state, MapIteratorVisitor::new(self.iter()))
     }
 }