diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2015-01-28 08:34:18 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2015-01-29 07:49:02 -0500 |
| commit | 788181d4055747b5307f186a873ab5d2acd29994 (patch) | |
| tree | 9b96bbdba0acfccaa447f312c07381425776ca80 /src/libserialize | |
| parent | 09ba9f5c87a24f82d9a332fdb913511eedf5a4ec (diff) | |
| download | rust-788181d4055747b5307f186a873ab5d2acd29994.tar.gz rust-788181d4055747b5307f186a873ab5d2acd29994.zip | |
s/Show/Debug/g
Diffstat (limited to 'src/libserialize')
| -rw-r--r-- | src/libserialize/hex.rs | 2 | ||||
| -rw-r--r-- | src/libserialize/json.rs | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/libserialize/hex.rs b/src/libserialize/hex.rs index 91c2561753b..d3c2ffa9544 100644 --- a/src/libserialize/hex.rs +++ b/src/libserialize/hex.rs @@ -61,7 +61,7 @@ pub trait FromHex { } /// Errors that can occur when decoding a hex encoded string -#[derive(Copy, Show)] +#[derive(Copy, Debug)] pub enum FromHexError { /// The input contained a character not part of the hex format InvalidHexCharacter(char, uint), diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index c21d4c60f7b..c13f9213b1e 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -214,7 +214,7 @@ use unicode::str::Utf16Item; use Encodable; /// Represents a json value -#[derive(Clone, PartialEq, PartialOrd, Show)] +#[derive(Clone, PartialEq, PartialOrd, Debug)] pub enum Json { I64(i64), U64(u64), @@ -235,7 +235,7 @@ pub struct AsJson<'a, T: 'a> { inner: &'a T } pub struct AsPrettyJson<'a, T: 'a> { inner: &'a T, indent: Option<uint> } /// The errors that can arise while parsing a JSON stream. -#[derive(Clone, Copy, PartialEq, Show)] +#[derive(Clone, Copy, PartialEq, Debug)] pub enum ErrorCode { InvalidSyntax, InvalidNumber, @@ -256,7 +256,7 @@ pub enum ErrorCode { NotUtf8, } -#[derive(Clone, Copy, PartialEq, Show)] +#[derive(Clone, Copy, PartialEq, Debug)] pub enum ParserError { /// msg, line, col SyntaxError(ErrorCode, uint, uint), @@ -266,7 +266,7 @@ pub enum ParserError { // Builder and Parser have the same errors. pub type BuilderError = ParserError; -#[derive(Clone, PartialEq, Show)] +#[derive(Clone, PartialEq, Debug)] pub enum DecoderError { ParseError(ParserError), ExpectedError(string::String, string::String), @@ -275,7 +275,7 @@ pub enum DecoderError { ApplicationError(string::String) } -#[derive(Copy, Show)] +#[derive(Copy, Debug)] pub enum EncoderError { FmtError(fmt::Error), BadHashmapKey, @@ -1239,7 +1239,7 @@ impl Index<uint> for Json { } /// The output of the streaming parser. -#[derive(PartialEq, Clone, Show)] +#[derive(PartialEq, Clone, Debug)] pub enum JsonEvent { ObjectStart, ObjectEnd, @@ -1254,7 +1254,7 @@ pub enum JsonEvent { Error(ParserError), } -#[derive(PartialEq, Show)] +#[derive(PartialEq, Debug)] enum ParserState { // Parse a value in an array, true means first element. ParseArray(bool), @@ -1284,7 +1284,7 @@ pub struct Stack { /// For example, StackElement::Key("foo"), StackElement::Key("bar"), /// StackElement::Index(3) and StackElement::Key("x") are the /// StackElements compositing the stack that represents foo.bar[3].x -#[derive(PartialEq, Clone, Show)] +#[derive(PartialEq, Clone, Debug)] pub enum StackElement<'l> { Index(u32), Key(&'l str), @@ -1292,7 +1292,7 @@ pub enum StackElement<'l> { // Internally, Key elements are stored as indices in a buffer to avoid // allocating a string for every member of an object. -#[derive(PartialEq, Clone, Show)] +#[derive(PartialEq, Clone, Debug)] enum InternalStackElement { InternalIndex(u32), InternalKey(u16, u16), // start, size @@ -2623,7 +2623,7 @@ mod tests { use std::num::Float; use std::string; - #[derive(RustcDecodable, Eq, PartialEq, Show)] + #[derive(RustcDecodable, Eq, PartialEq, Debug)] struct OptionData { opt: Option<uint>, } @@ -2650,20 +2650,20 @@ mod tests { ExpectedError("Number".to_string(), "false".to_string())); } - #[derive(PartialEq, RustcEncodable, RustcDecodable, Show)] + #[derive(PartialEq, RustcEncodable, RustcDecodable, Debug)] enum Animal { Dog, Frog(string::String, int) } - #[derive(PartialEq, RustcEncodable, RustcDecodable, Show)] + #[derive(PartialEq, RustcEncodable, RustcDecodable, Debug)] struct Inner { a: (), b: uint, c: Vec<string::String>, } - #[derive(PartialEq, RustcEncodable, RustcDecodable, Show)] + #[derive(PartialEq, RustcEncodable, RustcDecodable, Debug)] struct Outer { inner: Vec<Inner>, } |
