diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2017-09-03 23:04:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-03 23:04:30 +0200 |
commit | e9ed4dfcab399b9af5b53b85f41476fb9cc21df5 (patch) | |
tree | 9984e5d58814713c90db8624f87dbd759b2ff9be /lib/entry/libimagentrylist/src/listers/table.rs | |
parent | 28d7085b2dbef61b95e41f05a276b256d66918dc (diff) | |
parent | 7ce44e80905cc60c656e385c7d1a4bb769f2c115 (diff) |
Merge pull request #1048 from matthiasbeyer/remove-intoerror
Remove "IntoError" trait, use error_chain functionality
Diffstat (limited to 'lib/entry/libimagentrylist/src/listers/table.rs')
-rw-r--r-- | lib/entry/libimagentrylist/src/listers/table.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/entry/libimagentrylist/src/listers/table.rs b/lib/entry/libimagentrylist/src/listers/table.rs index 040b27ad..08dea4f2 100644 --- a/lib/entry/libimagentrylist/src/listers/table.rs +++ b/lib/entry/libimagentrylist/src/listers/table.rs @@ -24,7 +24,6 @@ use result::Result; use error::ResultExt; use libimagstore::store::FileLockEntry; -use libimagerror::into::IntoError; use prettytable::Table; use prettytable::cell::Cell; @@ -63,6 +62,7 @@ impl<F: Fn(&FileLockEntry) -> Vec<String>> Lister for TableLister<F> { fn list<'b, I: Iterator<Item = FileLockEntry<'b>>>(&self, entries: I) -> Result<()> { use error::ListErrorKind as LEK; + use error::ListError as LE; let mut table = Table::new(); let mut header_len : Option<usize> = None; @@ -90,7 +90,7 @@ impl<F: Fn(&FileLockEntry) -> Vec<String>> Lister for TableLister<F> { header_len = Some(v_len); } if header_len.map(|l| v_len > l).unwrap_or(false) { - return Err(LEK::FormatError.into_error()); + return Err(LE::from_kind(LEK::FormatError)); } while header_len.map(|l| v.len() != l).unwrap_or(false) { v.push(String::from("")); |