matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Shorten type names in import

Browse source
This commit is contained in:
Matthias Beyer 2016-05-26 22:17:08 +02:00
parent fdb5d1bb24
commit 25c4bea818
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libimagstore/src/lazyfile.rs
View file

@ -1,6 +1,6 @@
use libimagerror::into::IntoError; use libimagerror::into::IntoError;
use error::{StoreError, StoreErrorKind}; use error::{StoreError as SE, StoreErrorKind as SEK};
use std::io::{Seek, SeekFrom}; use std::io::{Seek, SeekFrom};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::fs::{File, OpenOptions, create_dir_all}; use std::fs::{File, OpenOptions, create_dir_all};
@ -33,7 +33,7 @@ impl LazyFile {
/** /**
* Get the mutable file behind a LazyFile object * Get the mutable file behind a LazyFile object
*/ */
pub fn get_file_mut(&mut self) -> Result<&mut File, StoreError> { pub fn get_file_mut(&mut self) -> Result<&mut File, SE> {
debug!("Getting lazy file: {:?}", self); debug!("Getting lazy file: {:?}", self);
let file = match *self { let file = match *self {
LazyFile::File(ref mut f) => return { LazyFile::File(ref mut f) => return {
@ -41,13 +41,13 @@ impl LazyFile {
// access to the file to be in a different context // access to the file to be in a different context
f.seek(SeekFrom::Start(0)) f.seek(SeekFrom::Start(0))
.map_err(Box::new) .map_err(Box::new)
.map_err(|e| StoreErrorKind::FileNotCreated.into_error_with_cause(e)) .map_err(|e| SEK::FileNotCreated.into_error_with_cause(e))
.map(|_| f) .map(|_| f)
}, },
LazyFile::Absent(ref p) => { LazyFile::Absent(ref p) => {
try!(open_file(p) try!(open_file(p)
.map_err(Box::new) .map_err(Box::new)
.map_err(|e| StoreErrorKind::FileNotFound.into_error_with_cause(e)) .map_err(|e| SEK::FileNotFound.into_error_with_cause(e))
) )
} }
}; };
@ -61,14 +61,14 @@ impl LazyFile {
/** /**
* Create a file out of this LazyFile object * Create a file out of this LazyFile object
*/ */
pub fn create_file(&mut self) -> Result<&mut File, StoreError> { pub fn create_file(&mut self) -> Result<&mut File, SE> {
debug!("Creating lazy file: {:?}", self); debug!("Creating lazy file: {:?}", self);
let file = match *self { let file = match *self {
LazyFile::File(ref mut f) => return Ok(f), LazyFile::File(ref mut f) => return Ok(f),
LazyFile::Absent(ref p) => { LazyFile::Absent(ref p) => {
try!(create_file(p) try!(create_file(p)
.map_err(Box::new) .map_err(Box::new)
.map_err(|e| StoreErrorKind::FileNotFound.into_error_with_cause(e)) .map_err(|e| SEK::FileNotFound.into_error_with_cause(e))
) )
} }
}; };