Fix serde2_macros and benchmarks, and silence some warnings

This commit is contained in:
Erick Tryzelaar
2015-03-03 11:07:33 -08:00
parent dd4f7537ea
commit 9904d32ff9
5 changed files with 54 additions and 47 deletions
+4 -4
View File
@@ -1,6 +1,6 @@
use std::error;
use std::fmt;
use std::old_io;
use std::io;
use de;
@@ -81,7 +81,7 @@ impl fmt::Debug for ErrorCode {
pub enum Error {
/// msg, line, col
SyntaxError(ErrorCode, usize, usize),
IoError(old_io::IoError),
IoError(io::Error),
/*
ExpectedError(String, String),
*/
@@ -139,8 +139,8 @@ impl fmt::Display for Error {
}
}
impl error::FromError<old_io::IoError> for Error {
fn from_error(error: old_io::IoError) -> Error {
impl error::FromError<io::Error> for Error {
fn from_error(error: io::Error) -> Error {
Error::IoError(error)
}
}