1 files changed, 19 insertions, 19 deletions

diff --git a/src/sftp.rs b/src/sftp.rs
index 37f8dfd..396359b 100644
--- a/src/sftp.rs
+++ b/src/sftp.rs
@@ -125,7 +125,7 @@ impl Sftp {
         mode: i32,
         open_type: OpenType,
     ) -> Result<File, Error> {
-        let filename = try!(util::path2bytes(filename));
+        let filename = util::path2bytes(filename)?;
         unsafe {
             let ret = raw::libssh2_sftp_open_ex(
                 self.raw,
@@ -168,7 +168,7 @@ impl Sftp {
     /// The returned paths are all joined with `dirname` when returned, and the
     /// paths `.` and `..` are filtered out of the returned list.
     pub fn readdir(&self, dirname: &Path) -> Result<Vec<(PathBuf, FileStat)>, Error> {
-        let mut dir = try!(self.opendir(dirname));
+        let mut dir = self.opendir(dirname)?;
         let mut ret = Vec::new();
         loop {
             match dir.readdir() {
@@ -188,7 +188,7 @@ impl Sftp {
 
     /// Create a directory on the remote file system.
     pub fn mkdir(&self, filename: &Path, mode: i32) -> Result<(), Error> {
-        let filename = try!(util::path2bytes(filename));
+        let filename = util::path2bytes(filename)?;
         self.rc(unsafe {
             raw::libssh2_sftp_mkdir_ex(
                 self.raw,
@@ -201,7 +201,7 @@ impl Sftp {
 
     /// Remove a directory from the remote file system.
     pub fn rmdir(&self, filename: &Path) -> Result<(), Error> {
-        let filename = try!(util::path2bytes(filename));
+        let filename = util::path2bytes(filename)?;
         self.rc(unsafe {
             raw::libssh2_sftp_rmdir_ex(
                 self.raw,
@@ -213,7 +213,7 @@ impl Sftp {
 
     /// Get the metadata for a file, performed by stat(2)
     pub fn stat(&self, filename: &Path) -> Result<FileStat, Error> {
-        let filename = try!(util::path2bytes(filename));
+        let filename = util::path2bytes(filename)?;
         unsafe {
             let mut ret = mem::zeroed();
             let rc = raw::libssh2_sftp_stat_ex(
@@ -223,14 +223,14 @@ impl Sftp {
                 raw::LIBSSH2_SFTP_STAT,
                 &mut ret,
             );
-            try!(self.rc(rc));
+            self.rc(rc)?;
             Ok(FileStat::from_raw(&ret))
         }
     }
 
     /// Get the metadata for a file, performed by lstat(2)
     pub fn lstat(&self, filename: &Path) -> Result<FileStat, Error> {
-        let filename = try!(util::path2bytes(filename));
+        let filename = util::path2bytes(filename)?;
         unsafe {
             let mut ret = mem::zeroed();
             let rc = raw::libssh2_sftp_stat_ex(
@@ -240,14 +240,14 @@ impl Sftp {
                 raw::LIBSSH2_SFTP_LSTAT,
                 &mut ret,
             );
-            try!(self.rc(rc));
+            self.rc(rc)?;
             Ok(FileStat::from_raw(&ret))
         }
     }
 
     /// Set the metadata for a file.
     pub fn setstat(&self, filename: &Path, stat: FileStat) -> Result<(), Error> {
-        let filename = try!(util::path2bytes(filename));
+        let filename = util::path2bytes(filename)?;
         self.rc(unsafe {
             let mut raw = stat.raw();
             raw::libssh2_sftp_stat_ex(
@@ -262,8 +262,8 @@ impl Sftp {
 
     /// Create a symlink at `target` pointing at `path`.
     pub fn symlink(&self, path: &Path, target: &Path) -> Result<(), Error> {
-        let path = try!(util::path2bytes(path));
-        let target = try!(util::path2bytes(target));
+        let path = util::path2bytes(path)?;
+        let target = util::path2bytes(target)?;
         self.rc(unsafe {
             raw::libssh2_sftp_symlink_ex(
                 self.raw,
@@ -287,7 +287,7 @@ impl Sftp {
     }
 
     fn readlink_op(&self, path: &Path, op: c_int) -> Result<PathBuf, Error> {
-        let path = try!(util::path2bytes(path));
+        let path = util::path2bytes(path)?;
         let mut ret = Vec::<u8>::with_capacity(128);
         let mut rc;
         loop {
@@ -331,8 +331,8 @@ impl Sftp {
     pub fn rename(&self, src: &Path, dst: &Path, flags: Option<RenameFlags>) -> Result<(), Error> {
         let flags =
             flags.unwrap_or(RenameFlags::ATOMIC | RenameFlags::OVERWRITE | RenameFlags::NATIVE);
-        let src = try!(util::path2bytes(src));
-        let dst = try!(util::path2bytes(dst));
+        let src = util::path2bytes(src)?;
+        let dst = util::path2bytes(dst)?;
         self.rc(unsafe {
             raw::libssh2_sftp_rename_ex(
                 self.raw,
@@ -347,7 +347,7 @@ impl Sftp {
 
     /// Remove a file on the remote filesystem
     pub fn unlink(&self, file: &Path) -> Result<(), Error> {
-        let file = try!(util::path2bytes(file));
+        let file = util::path2bytes(file)?;
         self.rc(unsafe {
             raw::libssh2_sftp_unlink_ex(self.raw, file.as_ptr() as *const _, file.len() as c_uint)
         })
@@ -399,9 +399,8 @@ impl<'sftp> File<'sftp> {
     pub fn stat(&mut self) -> Result<FileStat, Error> {
         unsafe {
             let mut ret = mem::zeroed();
-            try!(self
-                .sftp
-                .rc(raw::libssh2_sftp_fstat_ex(self.raw, &mut ret, 0)));
+            self.sftp
+                .rc(raw::libssh2_sftp_fstat_ex(self.raw, &mut ret, 0))?;
             Ok(FileStat::from_raw(&ret))
         }
     }
@@ -410,7 +409,8 @@ impl<'sftp> File<'sftp> {
     pub fn statvfs(&mut self) -> Result<raw::LIBSSH2_SFTP_STATVFS, Error> {
         unsafe {
             let mut ret = mem::zeroed();
-            try!(self.sftp.rc(raw::libssh2_sftp_fstatvfs(self.raw, &mut ret)));
+            self.sftp
+                .rc(raw::libssh2_sftp_fstatvfs(self.raw, &mut ret))?;
             Ok(ret)
         }
     }