Follow rust std: fmt::Show was renamed to fmt::Debug

This commit is contained in:
Thomas Bahn
2015-02-06 15:21:51 +01:00
parent 5dd077969c
commit 9a284ae7c2
19 changed files with 77 additions and 77 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ use de;
use super::error::{Error, ErrorCode};
#[derive(PartialEq, Show)]
#[derive(PartialEq, Debug)]
enum State {
// Parse a value.
Value,
+2 -2
View File
@@ -40,7 +40,7 @@ pub enum ErrorCode {
UnrecognizedHex,
}
impl fmt::Show for ErrorCode {
impl fmt::Debug for ErrorCode {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
ErrorCode::ConversionError(ref token) => write!(f, "failed to convert {:?}", token),
@@ -78,7 +78,7 @@ impl fmt::Show for ErrorCode {
}
}
#[derive(Clone, PartialEq, Show)]
#[derive(Clone, PartialEq, Debug)]
pub enum Error {
/// msg, line, col
SyntaxError(ErrorCode, usize, usize),
+10 -10
View File
@@ -318,7 +318,7 @@ pub mod error;
#[cfg(test)]
mod tests {
use std::fmt::Show;
use std::fmt::Debug;
use std::io;
use std::str;
use std::string;
@@ -357,7 +357,7 @@ mod tests {
})
}
#[derive(PartialEq, Show)]
#[derive(PartialEq, Debug)]
#[derive_serialize]
#[derive_deserialize]
enum Animal {
@@ -386,7 +386,7 @@ mod tests {
}
}
#[derive(PartialEq, Show)]
#[derive(PartialEq, Debug)]
#[derive_serialize]
#[derive_deserialize]
struct Inner {
@@ -407,7 +407,7 @@ mod tests {
}
}
#[derive(PartialEq, Show)]
#[derive(PartialEq, Debug)]
#[derive_serialize]
#[derive_deserialize]
struct Outer {
@@ -425,7 +425,7 @@ mod tests {
}
fn test_encode_ok<
T: PartialEq + Show + ToJson + ser::Serialize<super::Serializer<Vec<u8>>, io::IoError>
T: PartialEq + Debug + ToJson + ser::Serialize<super::Serializer<Vec<u8>>, io::IoError>
>(errors: &[(T, &str)]) {
for &(ref value, out) in errors.iter() {
let out = out.to_string();
@@ -439,7 +439,7 @@ mod tests {
}
fn test_pretty_encode_ok<
T: PartialEq + Show + ToJson + ser::Serialize<super::PrettySerializer<Vec<u8>>, io::IoError>
T: PartialEq + Debug + ToJson + ser::Serialize<super::PrettySerializer<Vec<u8>>, old_io::IoError>
>(errors: &[(T, &str)]) {
for &(ref value, out) in errors.iter() {
let out = out.to_string();
@@ -776,7 +776,7 @@ mod tests {
// FIXME (#5527): these could be merged once UFCS is finished.
fn test_parse_err<
'a,
T: Show + de::Deserialize<Parser<str::Bytes<'a>>, Error>
T: Debug + de::Deserialize<Parser<str::Bytes<'a>>, Error>
>(errors: &[(&'a str, Error)]) {
for &(s, ref err) in errors.iter() {
let v: Result<T, Error> = from_str(s);
@@ -786,7 +786,7 @@ mod tests {
fn test_parse_ok<
'a,
T: PartialEq + Show + ToJson + de::Deserialize<Parser<str::Bytes<'a>>, Error>
T: PartialEq + Debug + ToJson + de::Deserialize<Parser<str::Bytes<'a>>, Error>
>(errors: &[(&'a str, T)]) {
for &(s, ref value) in errors.iter() {
let v: T = from_str(s).unwrap();
@@ -798,7 +798,7 @@ mod tests {
}
fn test_json_deserialize_ok<
T: PartialEq + Show + ToJson + de::Deserialize<value::Deserializer, Error>
T: PartialEq + Debug + ToJson + de::Deserialize<value::Deserializer, Error>
>(errors: &[T]) {
for value in errors.iter() {
let v: T = from_json(value.to_json()).unwrap();
@@ -1103,7 +1103,7 @@ mod tests {
("\"jodhpurs\"", Some("jodhpurs".to_string())),
]);
#[derive(PartialEq, Show)]
#[derive(PartialEq, Debug)]
#[derive_serialize]
#[derive_deserialize]
struct Foo {
+1 -1
View File
@@ -81,7 +81,7 @@ fn spaces<W: Writer>(wr: &mut W, mut n: usize) -> IoResult<()> {
}
/*
#[derive(Show)]
#[derive(Debug)]
enum SerializerState {
ValueState,
TupleState,
+1 -1
View File
@@ -226,7 +226,7 @@ impl<'a, 'b> Writer for WriterFormatter<'a, 'b> {
}
}
impl fmt::Show for Value {
impl fmt::Debug for Value {
/// Serializes a json value into a string
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let wr = WriterFormatter { inner: f };