diff --git a/libraries/libarchive/src/reader.rs b/libraries/libarchive/src/reader.rs index 2d56ca13..6211d5f1 100644 --- a/libraries/libarchive/src/reader.rs +++ b/libraries/libarchive/src/reader.rs @@ -1,6 +1,5 @@ use std::any::Any; use std::default::Default; -use std::error::Error; use std::ffi::CString; use std::io::{self, Read}; use std::mem; @@ -26,7 +25,7 @@ unsafe extern "C" fn stream_read_callback( match pipe.read_bytes() { Ok(size) => size as ssize_t, Err(e) => { - let desc = CString::new(e.description()).unwrap(); + let desc = CString::new(e.to_string()).unwrap(); ffi::archive_set_error(handle, e.raw_os_error().unwrap_or(0), desc.as_ptr()); -1 as ssize_t } @@ -93,7 +92,7 @@ pub struct ReaderEntry { } struct Pipe { - reader: Box, + reader: Box, buffer: Vec, } @@ -112,7 +111,7 @@ impl Pipe { impl FileReader { pub fn open>(mut builder: Builder, file: T) -> ArchiveResult { - try!(builder.check_consumed()); + builder.check_consumed()?; let c_file = CString::new(file.as_ref().to_string_lossy().as_bytes()).unwrap(); unsafe { match ffi::archive_read_open_filename(builder.handle(), c_file.as_ptr(), BLOCK_SIZE) { @@ -120,7 +119,7 @@ impl FileReader { builder.consume(); Ok(Self::new(builder.handle())) } - _ => Err(ArchiveError::from(&builder as &Handle)), + _ => Err(ArchiveError::from(&builder as &dyn Handle)), } } } @@ -176,7 +175,7 @@ impl StreamReader { } _ => { builder.consume(); - Err(ArchiveError::from(&builder as &Handle)) + Err(ArchiveError::from(&builder as &dyn Handle)) } } } @@ -245,7 +244,7 @@ impl Builder { }; match result { ffi::ARCHIVE_OK => Ok(()), - _ => ArchiveResult::from(self as &Handle), + _ => ArchiveResult::from(self as &dyn Handle), } } @@ -284,7 +283,7 @@ impl Builder { }; match result { ffi::ARCHIVE_OK => Ok(()), - _ => ArchiveResult::from(self as &Handle), + _ => ArchiveResult::from(self as &dyn Handle), } } @@ -310,17 +309,17 @@ impl Builder { }; match result { ffi::ARCHIVE_OK => Ok(()), - _ => ArchiveResult::from(self as &Handle), + _ => ArchiveResult::from(self as &dyn Handle), } } pub fn open_file>(self, file: T) -> ArchiveResult { - try!(self.check_consumed()); + self.check_consumed()?; FileReader::open(self, file) } pub fn open_stream(self, src: T) -> ArchiveResult { - try!(self.check_consumed()); + self.check_consumed()?; StreamReader::open(self, src) } diff --git a/libraries/libarchive/src/writer.rs b/libraries/libarchive/src/writer.rs index 5a9627e3..ac29d42e 100644 --- a/libraries/libarchive/src/writer.rs +++ b/libraries/libarchive/src/writer.rs @@ -64,7 +64,7 @@ impl Disk { unsafe { match ffi::archive_write_set_bytes_per_block(self.handle, count) { ffi::ARCHIVE_OK => Ok(()), - _ => ArchiveResult::from(self as &Handle), + _ => ArchiveResult::from(self as &dyn Handle), } } } @@ -73,7 +73,7 @@ impl Disk { unsafe { match ffi::archive_write_set_bytes_in_last_block(self.handle, count) { ffi::ARCHIVE_OK => Ok(()), - _ => ArchiveResult::from(self as &Handle), + _ => ArchiveResult::from(self as &dyn Handle), } } } @@ -83,7 +83,7 @@ impl Disk { unsafe { match ffi::archive_write_disk_set_options(self.handle, eopt.flags) { ffi::ARCHIVE_OK => Ok(()), - _ => ArchiveResult::from(self as &Handle), + _ => ArchiveResult::from(self as &dyn Handle), } } } @@ -96,7 +96,7 @@ impl Disk { unsafe { match ffi::archive_write_disk_set_standard_lookup(self.handle) { ffi::ARCHIVE_OK => Ok(()), - _ => ArchiveResult::from(self as &Handle), + _ => ArchiveResult::from(self as &dyn Handle), } } } @@ -131,14 +131,14 @@ impl Disk { } } if write_pending { - bytes += try!(self.write_data(reader)); + bytes += self.write_data(reader)?; write_pending = false; } } unsafe { match ffi::archive_write_finish_entry(self.handle()) { ffi::ARCHIVE_OK => Ok(bytes), - _ => Err(ArchiveError::from(self as &Handle)), + _ => Err(ArchiveError::from(self as &dyn Handle)), } } } @@ -147,7 +147,7 @@ impl Disk { unsafe { match ffi::archive_write_close(self.handle()) { ffi::ARCHIVE_OK => Ok(()), - _ => ArchiveResult::from(self as &Handle), + _ => ArchiveResult::from(self as &dyn Handle), } } } @@ -170,10 +170,10 @@ impl Disk { if ffi::archive_write_data_block(self.handle, buff, size, offset) != ffi::ARCHIVE_OK as isize { - return Err(ArchiveError::from(self as &Handle)); + return Err(ArchiveError::from(self as &dyn Handle)); } } - _ => return Err(ArchiveError::from(reader as &Handle)), + _ => return Err(ArchiveError::from(reader as &dyn Handle)), } } } @@ -183,7 +183,7 @@ impl Disk { unsafe { match ffi::archive_write_header(self.handle, entry.entry()) { ffi::ARCHIVE_OK => Ok(()), - _ => ArchiveResult::from(self as &Handle), + _ => ArchiveResult::from(self as &dyn Handle), } } } @@ -243,7 +243,7 @@ impl Builder { }; match result { ffi::ARCHIVE_OK => Ok(()), - _ => ArchiveResult::from(self as &Handle), + _ => ArchiveResult::from(self as &dyn Handle), } } @@ -277,7 +277,7 @@ impl Builder { }; match result { ffi::ARCHIVE_OK => Ok(()), - _ => ArchiveResult::from(self as &Handle), + _ => ArchiveResult::from(self as &dyn Handle), } } @@ -292,7 +292,7 @@ impl Builder { self.consumed = true; Ok(Writer::new(self.handle)) } - _ => Err(ArchiveError::from(&self as &Handle)), + _ => Err(ArchiveError::from(&self as &dyn Handle)), } } }