matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Replace GlobError with link to ::glob::PatternError

Browse source
This commit is contained in:
Matthias Beyer 2017-09-09 21:46:25 +02:00
parent 6aa695974c
commit 2ce2ba54da
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/core/libimagstore/src/error.rs
View file

@ -29,6 +29,7 @@ error_chain! {
foreign_links { foreign_links {
Io(::std::io::Error); Io(::std::io::Error);
TomlDeserError(::toml::de::Error); TomlDeserError(::toml::de::Error);
GlobPatternError(::glob::PatternError);
} }
errors { errors {
@ -158,11 +159,6 @@ error_chain! {
display("Header type is wrong") display("Header type is wrong")
} }
GlobError {
description("glob() error")
display("glob() error")
}
EncodingError { EncodingError {
description("Encoding error") description("Encoding error")
display("Encoding error") display("Encoding error")

3
lib/core/libimagstore/src/store.rs
View file

@ -507,10 +507,9 @@ impl Store {
.and_then(|path| { .and_then(|path| {
let path = [ path, "/**/*" ].join(""); let path = [ path, "/**/*" ].join("");
debug!("glob()ing with '{}'", path); debug!("glob()ing with '{}'", path);
glob(&path[..]).chain_err(|| SEK::GlobError) glob(&path[..]).map_err(From::from)
}) })
.map(|paths| GlobStoreIdIterator::new(paths, self.path().clone()).into()) .map(|paths| GlobStoreIdIterator::new(paths, self.path().clone()).into())
.chain_err(|| SEK::GlobError)
.chain_err(|| SEK::RetrieveForModuleCallError) .chain_err(|| SEK::RetrieveForModuleCallError)
} }