clippy fixups

This commit is contained in:
Rob Walker 2018-08-01 11:02:20 -07:00 committed by Grimes
parent fef93958c8
commit 3ea784aff7
1 changed files with 4 additions and 3 deletions

View File

@ -28,7 +28,7 @@ const SIZEOF_U64: u64 = size_of::<u64>() as u64;
impl LedgerWindow { impl LedgerWindow {
// opens a Ledger in directory, provides "infinite" window // opens a Ledger in directory, provides "infinite" window
pub fn new(directory: String) -> io::Result<Self> { pub fn new(directory: &str) -> io::Result<Self> {
let directory = Path::new(&directory); let directory = Path::new(&directory);
let index = File::open(directory.join("index"))?; let index = File::open(directory.join("index"))?;
@ -71,7 +71,7 @@ pub struct LedgerWriter {
impl LedgerWriter { impl LedgerWriter {
// opens or creates a LedgerWriter in directory // opens or creates a LedgerWriter in directory
pub fn new(directory: String) -> io::Result<Self> { pub fn new(directory: &str) -> io::Result<Self> {
let directory = Path::new(&directory); let directory = Path::new(&directory);
create_dir_all(directory)?; create_dir_all(directory)?;
@ -143,7 +143,7 @@ impl Iterator for LedgerReader {
} }
/// Return an iterator for all the entries in the given file. /// Return an iterator for all the entries in the given file.
pub fn read_ledger(directory: String) -> io::Result<impl Iterator<Item = io::Result<Entry>>> { pub fn read_ledger(directory: &str) -> io::Result<impl Iterator<Item = io::Result<Entry>>> {
let directory = Path::new(&directory); let directory = Path::new(&directory);
let index = File::open(directory.join("index"))?; let index = File::open(directory.join("index"))?;
@ -457,6 +457,7 @@ mod tests {
let read_entry = window.get_entry(i as u64).unwrap(); let read_entry = window.get_entry(i as u64).unwrap();
assert_eq!(*entry, read_entry); assert_eq!(*entry, read_entry);
} }
assert!(window.get_entry(100).is_err());
std::fs::remove_file(Path::new(&ledger_path).join("data")).unwrap(); std::fs::remove_file(Path::new(&ledger_path).join("data")).unwrap();
// empty data file should fall over // empty data file should fall over