diff --git a/libraries/libarchive/src/archive.rs b/libraries/libarchive/src/archive.rs index 2a798702..71559923 100644 --- a/libraries/libarchive/src/archive.rs +++ b/libraries/libarchive/src/archive.rs @@ -3,8 +3,8 @@ use std::ffi::{CStr, CString}; use std::path::PathBuf; use std::str; -use libarchive3_sys::ffi; use error::ErrCode; +use libarchive3_sys::ffi; pub enum ReadCompression { All, diff --git a/libraries/libarchive/src/error.rs b/libraries/libarchive/src/error.rs index 1479f21f..4f574257 100644 --- a/libraries/libarchive/src/error.rs +++ b/libraries/libarchive/src/error.rs @@ -1,6 +1,6 @@ +use archive; use std::error; use std::fmt; -use archive; pub type ArchiveResult = Result; diff --git a/libraries/libarchive/src/lib.rs b/libraries/libarchive/src/lib.rs index c24af2f9..8006328e 100644 --- a/libraries/libarchive/src/lib.rs +++ b/libraries/libarchive/src/lib.rs @@ -1,5 +1,5 @@ -extern crate libc; extern crate libarchive3_sys; +extern crate libc; pub mod archive; pub mod error; diff --git a/libraries/libarchive/src/writer.rs b/libraries/libarchive/src/writer.rs index 9218aa2f..5a9627e3 100644 --- a/libraries/libarchive/src/writer.rs +++ b/libraries/libarchive/src/writer.rs @@ -1,13 +1,13 @@ use std::default::Default; +use std::ffi::CString; use std::path::Path; use std::ptr; -use std::ffi::CString; use libarchive3_sys::ffi; use archive::{Entry, ExtractOptions, Handle, WriteFilter, WriteFormat}; +use error::{ArchiveError, ArchiveResult}; use reader::{Reader, ReaderEntry}; -use error::{ArchiveResult, ArchiveError}; pub struct Writer { handle: *mut ffi::Struct_archive, @@ -159,14 +159,17 @@ impl Disk { unsafe { loop { - match ffi::archive_read_data_block(reader.handle(), - &mut buff, - &mut size, - &mut offset) { + match ffi::archive_read_data_block( + reader.handle(), + &mut buff, + &mut size, + &mut offset, + ) { ffi::ARCHIVE_EOF => return Ok(size), ffi::ARCHIVE_OK => { - if ffi::archive_write_data_block(self.handle, buff, size, offset) != - ffi::ARCHIVE_OK as isize { + if ffi::archive_write_data_block(self.handle, buff, size, offset) + != ffi::ARCHIVE_OK as isize + { return Err(ArchiveError::from(self as &Handle)); } } diff --git a/libraries/libarchive/tests/lib.rs b/libraries/libarchive/tests/lib.rs index 872e9472..d35c5373 100644 --- a/libraries/libarchive/tests/lib.rs +++ b/libraries/libarchive/tests/lib.rs @@ -2,10 +2,10 @@ extern crate libarchive; pub mod util; -use std::fs::File; use libarchive::archive::{self, ReadFilter, ReadFormat}; use libarchive::reader::{self, Reader}; use libarchive::writer; +use std::fs::File; #[test] fn reading_from_file() { @@ -37,11 +37,14 @@ fn read_archive_from_stream() { Ok(mut reader) => { assert_eq!(reader.header_position(), 0); let writer = writer::Disk::new(); - let count = writer.write(&mut reader, Some("/opt/bldr/fucks")).ok().unwrap(); + let count = writer + .write(&mut reader, Some("/opt/bldr/fucks")) + .ok() + .unwrap(); assert_eq!(count, 14); assert_eq!(reader.header_position(), 1024); assert_eq!(4, 4); - }, + } Err(e) => { println!("{:?}", e); } @@ -92,7 +95,7 @@ fn extracting_a_reader_twice() { println!("{:?}", reader.header_position()); match writer.write(&mut reader, None) { Ok(_) => println!("oops"), - Err(_) => println!("nice") + Err(_) => println!("nice"), } assert_eq!(4, 4) } diff --git a/libraries/libarchive/tests/util/path.rs b/libraries/libarchive/tests/util/path.rs index da579b33..882a2973 100644 --- a/libraries/libarchive/tests/util/path.rs +++ b/libraries/libarchive/tests/util/path.rs @@ -6,7 +6,14 @@ pub fn exe_path() -> PathBuf { } pub fn root() -> PathBuf { - exe_path().parent().unwrap().parent().unwrap().parent().unwrap().join("tests") + exe_path() + .parent() + .unwrap() + .parent() + .unwrap() + .parent() + .unwrap() + .join("tests") } pub fn fixtures() -> PathBuf {