Update to rust master

1 files changed, 3 insertions, 3 deletions

diff --git a/src/error.rs b/src/error.rs
index d6d2a7b..7019aa9 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,4 +1,4 @@
-use std::error::{self, FromError};
+use std::error;
 use std::ffi::NulError;
 use std::fmt;
 use std::str;
@@ -114,8 +114,8 @@ impl error::Error for Error {
     fn description(&self) -> &str { self.message() }
 }
 
-impl FromError<NulError> for Error {
-    fn from_error(_: NulError) -> Error {
+impl From<NulError> for Error {
+    fn from(_: NulError) -> Error {
         Error::new(raw::LIBSSH2_ERROR_INVAL,
                    "provided data contained a nul byte and could not be used \
                     as as string")