diff --git a/benches/bench_log.rs b/benches/bench_log.rs index 2fa17e32..feafe19b 100644 --- a/benches/bench_log.rs +++ b/benches/bench_log.rs @@ -9,7 +9,7 @@ extern crate serialize; extern crate test; use std::io; -use std::io::MemWriter; +use std::io::{MemWriter, AsRefWriter}; use test::Bencher; use serde::de; diff --git a/benches/bench_struct.rs b/benches/bench_struct.rs index b2e58a16..4632e0e3 100644 --- a/benches/bench_struct.rs +++ b/benches/bench_struct.rs @@ -150,7 +150,7 @@ mod decoder { #[inline] fn read_struct(&mut self, s_name: &str, _len: uint, f: |&mut OuterDecoder| -> Result) -> Result { match self.stack.pop() { - Some(OuterState(Outer { inner: inner })) => { + Some(OuterState(Outer { inner })) => { if s_name == "Outer" { self.stack.push(VecState(inner)); self.stack.push(FieldState("inner")); @@ -159,7 +159,7 @@ mod decoder { Err(SyntaxError("expected Outer".to_string())) } } - Some(InnerState(Inner { a: (), b: b, c: c })) => { + Some(InnerState(Inner { a: (), b, c })) => { if s_name == "Inner" { self.stack.push(MapState(c)); self.stack.push(FieldState("c")); diff --git a/serde2/benches/bench_log.rs b/serde2/benches/bench_log.rs index 3887d85d..16fc6247 100644 --- a/serde2/benches/bench_log.rs +++ b/serde2/benches/bench_log.rs @@ -9,7 +9,7 @@ extern crate serialize; extern crate test; use std::io; -use std::io::MemWriter; +use std::io::{MemWriter, AsRefWriter}; use test::Bencher; //use serde2::de; diff --git a/serde_macros/src/lib.rs b/serde_macros/src/lib.rs index 9ea76289..876d5705 100644 --- a/serde_macros/src/lib.rs +++ b/serde_macros/src/lib.rs @@ -291,7 +291,7 @@ fn deserialize_struct( let type_name_str = cx.expr_str(span, token::get_ident(type_ident)); let fields = match *fields { - Unnamed(_) => fail!(), + Unnamed(_) => panic!(), Named(ref fields) => fields.as_slice(), }; diff --git a/src/json/mod.rs b/src/json/mod.rs index dbe3a6bb..09ddf2d9 100644 --- a/src/json/mod.rs +++ b/src/json/mod.rs @@ -12,7 +12,7 @@ // Copyright (c) 2011 Google Inc. #![forbid(non_camel_case_types)] -#![allow(missing_doc)] +#![allow(missing_docs)] /*! JSON parsing and serialization @@ -65,7 +65,7 @@ To serialize using `Serializable`: extern crate serde_macros; extern crate serde; -use std::io; +use std::io::{MemWriter, AsRefWriter}; use serde::json; use serde::Serializable; @@ -79,12 +79,12 @@ fn main() { data_str: "example of string to serialize".to_string() }; - let mut m = io::MemWriter::new(); + let mut m = MemWriter::new(); { let mut serializer = json::Serializer::new(m.by_ref()); match to_serialize_object.serialize(&mut serializer) { Ok(()) => (), - Err(e) => fail!("json serialization error: {}", e), + Err(e) => panic!("json serialization error: {}", e), } } } @@ -162,7 +162,7 @@ fn main() { let mut parser = json::Parser::new(json_str_to_deserialize.bytes()); let deserialized_object: MyStruct = match Deserializable::deserialize(&mut parser) { Ok(v) => v, - Err(e) => fail!("Decoding error: {}", e) + Err(e) => panic!("Decoding error: {}", e) }; } ``` @@ -204,7 +204,7 @@ fn main() { let deserialized_object: TestStruct1 = match json::from_str(serialized_str.as_slice()) { Ok(deserialized_object) => deserialized_object, - Err(e) => fail!("json deserialization error: {}", e), + Err(e) => panic!("json deserialization error: {}", e), }; } ``` @@ -268,7 +268,7 @@ use std::collections::{HashMap, TreeMap, treemap}; use std::f32; use std::f64; use std::fmt; -use std::io::{IoResult, MemWriter}; +use std::io::{IoResult, MemWriter, AsRefWriter}; use std::io; use std::num::{FPNaN, FPInfinite}; use std::num; @@ -699,12 +699,12 @@ impl de::Deserializer for JsonDeserializer { de::MapStart(_) => { let state = match self.stack.pop() { Some(state) => state, - None => { fail!("state machine error, state stack empty"); } + None => { panic!("state machine error, state stack empty"); } }; let mut iter = match state { JsonDeserializerObjectState(iter) => iter, - _ => { fail!("state machine error, expected an object"); } + _ => { panic!("state machine error, expected an object"); } }; let (variant, fields) = match iter.next() { @@ -1636,7 +1636,7 @@ impl Stack { let len = self.stack.len(); let idx = match *self.stack.last().unwrap() { InternalIndex(i) => { i + 1 } - _ => { fail!(); } + _ => { panic!(); } }; *self.stack.get_mut(len - 1) = InternalIndex(idx); } @@ -2229,7 +2229,7 @@ impl> de::Deserializer for Parser { Some(ParseObjectCommaOrEnd) => { try!(self.parse_object_comma_or_end()) } - _ => fail!("invalid internal state"), + _ => panic!("invalid internal state"), }; let s = match result { @@ -3311,9 +3311,9 @@ mod tests { Ok(json) => Decodable::decode(&mut Decoder::new(json)) }; match res { - Ok(_) => fail!("`{}` parsed & decoded ok, expecting error `{}`", + Ok(_) => panic!("`{}` parsed & decoded ok, expecting error `{}`", to_parse, expected), - Err(ParseError(e)) => fail!("`{}` is not valid json: {}", + Err(ParseError(e)) => panic!("`{}` is not valid json: {}", to_parse, e), Err(e) => { assert_eq!(e, expected); @@ -3537,7 +3537,7 @@ mod tests { }; let (ref expected_evt, ref expected_stack) = expected[i]; if !parser.stack().is_equal_to(expected_stack.as_slice()) { - fail!("Parser stack is not equal to {}", expected_stack); + panic!("Parser stack is not equal to {}", expected_stack); } assert_eq!(&evt, expected_evt); i+=1; @@ -4035,7 +4035,7 @@ mod bench { match parser.next() { None => return, Some(Ok(_)) => { } - Some(Err(err)) => { fail!("error: {}", err); } + Some(Err(err)) => { panic!("error: {}", err); } } } }); diff --git a/src/ser.rs b/src/ser.rs index dff77850..a4adce4f 100644 --- a/src/ser.rs +++ b/src/ser.rs @@ -417,7 +417,7 @@ mod tests { fn serialize<'b>(&mut self, token: Token<'b>) -> Result<(), Error> { let t = match self.iter.next() { Some(t) => t, - None => { fail!(); } + None => { panic!(); } }; assert_eq!(t, token);