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
+3 -3
View File
@@ -529,7 +529,7 @@ pub fn from_str<'a, T>(s: &'a str) -> Result<T, Error>
#[cfg(test)]
mod tests {
use std::str;
use std::fmt::Show;
use std::fmt::Debug;
use std::collections::BTreeMap;
use de::Deserialize;
@@ -545,7 +545,7 @@ mod tests {
}
fn test_parse_ok<'a, T>(errors: Vec<(&'a str, T)>)
where T: PartialEq + Show + Deserialize,
where T: PartialEq + Debug + Deserialize,
{
for (s, value) in errors.into_iter() {
let v: Result<T, Error> = from_str(s);
@@ -559,7 +559,7 @@ mod tests {
}
fn test_parse_err<'a, T>(errors: Vec<(&'a str, Error)>)
where T: PartialEq + Show + Deserialize
where T: PartialEq + Debug + Deserialize
{
for (s, err) in errors.into_iter() {
let v: Result<T, Error> = from_str(s);
+2 -2
View File
@@ -37,7 +37,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),
@@ -75,7 +75,7 @@ impl fmt::Show for ErrorCode {
}
}
#[derive(Clone, PartialEq, Show)]
#[derive(Clone, PartialEq, Debug)]
pub enum Error {
/// msg, line, col
SyntaxError(ErrorCode, usize, usize),
+1 -1
View File
@@ -57,7 +57,7 @@ impl<'a, 'b> io::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 mut wr = WriterFormatter { inner: f };