diff options
author | Gavin Thomas Claugus <gclaugus@gmail.com> | 2016-08-13 12:11:19 -0400 |
---|---|---|
committer | Gavin Thomas Claugus <gclaugus@gmail.com> | 2016-08-13 12:11:19 -0400 |
commit | 0e4079287ae32a5f148ca53f2185d298049307f0 (patch) | |
tree | 9c72183bb2edaab7eb24158ca39f2c31791be070 /libimagentryfilter | |
parent | fda1c94beec40f25eff284b1038b006ff8bdd67a (diff) |
libimagentryfilter: Update use stmts for filters
Signed-off-by: Gavin Thomas Claugus <gclaugus@gmail.com>
Diffstat (limited to 'libimagentryfilter')
20 files changed, 20 insertions, 23 deletions
diff --git a/libimagentryfilter/src/builtin/bool_filter.rs b/libimagentryfilter/src/builtin/bool_filter.rs index 14dbbc8e..d06d0c14 100644 --- a/libimagentryfilter/src/builtin/bool_filter.rs +++ b/libimagentryfilter/src/builtin/bool_filter.rs @@ -1,6 +1,6 @@ use libimagstore::store::Entry; -use filter::Filter; +use filters::filter::Filter; pub struct BoolFilter(bool); diff --git a/libimagentryfilter/src/builtin/content/grep.rs b/libimagentryfilter/src/builtin/content/grep.rs index f0bfb992..048f3cdb 100644 --- a/libimagentryfilter/src/builtin/content/grep.rs +++ b/libimagentryfilter/src/builtin/content/grep.rs @@ -1,10 +1,9 @@ +use filters::filter::Filter; use regex::Regex; use regex::Error as RError; use libimagstore::store::Entry; -use filter::Filter; - pub trait IntoRegex { fn into_regex(self) -> Result<Regex, RError>; diff --git a/libimagentryfilter/src/builtin/content/length/is_over.rs b/libimagentryfilter/src/builtin/content/length/is_over.rs index 9190b01b..3d318ba3 100644 --- a/libimagentryfilter/src/builtin/content/length/is_over.rs +++ b/libimagentryfilter/src/builtin/content/length/is_over.rs @@ -1,7 +1,6 @@ +use filters::filter::Filter; use libimagstore::store::Entry; -use filter::Filter; - pub struct ContentLengthIsOver { val: usize } diff --git a/libimagentryfilter/src/builtin/content/length/is_under.rs b/libimagentryfilter/src/builtin/content/length/is_under.rs index cca857da..0f4f595f 100644 --- a/libimagentryfilter/src/builtin/content/length/is_under.rs +++ b/libimagentryfilter/src/builtin/content/length/is_under.rs @@ -1,7 +1,6 @@ +use filters::filter::Filter; use libimagstore::store::Entry; -use filter::Filter; - pub struct ContentLengthIsUnder { val: usize } diff --git a/libimagentryfilter/src/builtin/header/field_eq.rs b/libimagentryfilter/src/builtin/header/field_eq.rs index eeef5aa7..9d432cc3 100644 --- a/libimagentryfilter/src/builtin/header/field_eq.rs +++ b/libimagentryfilter/src/builtin/header/field_eq.rs @@ -3,7 +3,7 @@ use libimagstore::store::Entry; use builtin::header::field_path::FieldPath; use builtin::header::field_predicate::FieldPredicate; use builtin::header::field_predicate::Predicate; -use filter::Filter; +use filters::filter::Filter; use toml::Value; diff --git a/libimagentryfilter/src/builtin/header/field_exists.rs b/libimagentryfilter/src/builtin/header/field_exists.rs index 98b3d691..30eaaca2 100644 --- a/libimagentryfilter/src/builtin/header/field_exists.rs +++ b/libimagentryfilter/src/builtin/header/field_exists.rs @@ -1,7 +1,7 @@ use libimagstore::store::Entry; use builtin::header::field_path::FieldPath; -use filter::Filter; +use filters::filter::Filter; pub struct FieldExists { header_field_path: FieldPath, diff --git a/libimagentryfilter/src/builtin/header/field_grep.rs b/libimagentryfilter/src/builtin/header/field_grep.rs index aac42207..04e45d22 100644 --- a/libimagentryfilter/src/builtin/header/field_grep.rs +++ b/libimagentryfilter/src/builtin/header/field_grep.rs @@ -6,7 +6,7 @@ use libimagstore::store::Entry; use builtin::header::field_path::FieldPath; use builtin::header::field_predicate::FieldPredicate; use builtin::header::field_predicate::Predicate; -use filter::Filter; +use filters::filter::Filter; struct EqGrep{ regex: Regex diff --git a/libimagentryfilter/src/builtin/header/field_gt.rs b/libimagentryfilter/src/builtin/header/field_gt.rs index 7067399d..8ac8046a 100644 --- a/libimagentryfilter/src/builtin/header/field_gt.rs +++ b/libimagentryfilter/src/builtin/header/field_gt.rs @@ -3,7 +3,7 @@ use libimagstore::store::Entry; use builtin::header::field_path::FieldPath; use builtin::header::field_predicate::FieldPredicate; use builtin::header::field_predicate::Predicate; -use filter::Filter; +use filters::filter::Filter; use toml::Value; diff --git a/libimagentryfilter/src/builtin/header/field_isempty.rs b/libimagentryfilter/src/builtin/header/field_isempty.rs index 3da9360f..186dc264 100644 --- a/libimagentryfilter/src/builtin/header/field_isempty.rs +++ b/libimagentryfilter/src/builtin/header/field_isempty.rs @@ -1,7 +1,7 @@ use libimagstore::store::Entry; use builtin::header::field_path::FieldPath; -use filter::Filter; +use filters::filter::Filter; use toml::Value; diff --git a/libimagentryfilter/src/builtin/header/field_istype.rs b/libimagentryfilter/src/builtin/header/field_istype.rs index 5af73623..c9c59be6 100644 --- a/libimagentryfilter/src/builtin/header/field_istype.rs +++ b/libimagentryfilter/src/builtin/header/field_istype.rs @@ -3,7 +3,7 @@ use libimagstore::store::Entry; use builtin::header::field_path::FieldPath; use builtin::header::field_predicate::FieldPredicate; use builtin::header::field_predicate::Predicate; -use filter::Filter; +use filters::filter::Filter; use toml::Value; diff --git a/libimagentryfilter/src/builtin/header/field_lt.rs b/libimagentryfilter/src/builtin/header/field_lt.rs index dee98476..ce1d6aad 100644 --- a/libimagentryfilter/src/builtin/header/field_lt.rs +++ b/libimagentryfilter/src/builtin/header/field_lt.rs @@ -3,7 +3,7 @@ use libimagstore::store::Entry; use builtin::header::field_path::FieldPath; use builtin::header::field_predicate::FieldPredicate; use builtin::header::field_predicate::Predicate; -use filter::Filter; +use filters::filter::Filter; use toml::Value; diff --git a/libimagentryfilter/src/builtin/header/field_predicate.rs b/libimagentryfilter/src/builtin/header/field_predicate.rs index 5dddc46e..67de3ac2 100644 --- a/libimagentryfilter/src/builtin/header/field_predicate.rs +++ b/libimagentryfilter/src/builtin/header/field_predicate.rs @@ -1,7 +1,7 @@ use libimagstore::store::Entry; use builtin::header::field_path::FieldPath; -use filter::Filter; +use filters::filter::Filter; use toml::Value; diff --git a/libimagentryfilter/src/builtin/header/version/eq.rs b/libimagentryfilter/src/builtin/header/version/eq.rs index e6b93893..a478308c 100644 --- a/libimagentryfilter/src/builtin/header/version/eq.rs +++ b/libimagentryfilter/src/builtin/header/version/eq.rs @@ -3,7 +3,7 @@ use toml::Value; use libimagstore::store::Entry; -use filter::Filter; +use filters::filter::Filter; pub struct VersionEq { version: Version, diff --git a/libimagentryfilter/src/builtin/header/version/gt.rs b/libimagentryfilter/src/builtin/header/version/gt.rs index f03b0fa9..e258cfd0 100644 --- a/libimagentryfilter/src/builtin/header/version/gt.rs +++ b/libimagentryfilter/src/builtin/header/version/gt.rs @@ -3,7 +3,7 @@ use toml::Value; use libimagstore::store::Entry; -use filter::Filter; +use filters::filter::Filter; pub struct VersionGt { version: Version, diff --git a/libimagentryfilter/src/builtin/header/version/lt.rs b/libimagentryfilter/src/builtin/header/version/lt.rs index 5be6a191..e3ac178e 100644 --- a/libimagentryfilter/src/builtin/header/version/lt.rs +++ b/libimagentryfilter/src/builtin/header/version/lt.rs @@ -3,7 +3,7 @@ use toml::Value; use libimagstore::store::Entry; -use filter::Filter; +use filters::filter::Filter; pub struct VersionLt { version: Version, diff --git a/libimagentryfilter/src/builtin/header/version/range.rs b/libimagentryfilter/src/builtin/header/version/range.rs index 9dffe5d6..4050a2a9 100644 --- a/libimagentryfilter/src/builtin/header/version/range.rs +++ b/libimagentryfilter/src/builtin/header/version/range.rs @@ -4,7 +4,7 @@ use libimagstore::store::Entry; use builtin::header::version::gt::VersionGt; use builtin::header::version::lt::VersionLt; -use filter::Filter; +use filters::filter::Filter; use ops::and::And; use ops::not::Not; diff --git a/libimagentryfilter/src/ops/and.rs b/libimagentryfilter/src/ops/and.rs index 79470b9b..43465621 100644 --- a/libimagentryfilter/src/ops/and.rs +++ b/libimagentryfilter/src/ops/and.rs @@ -1,6 +1,6 @@ use libimagstore::store::Entry; -use filter::Filter; +use filters::filter::Filter; pub struct And { a: Box<Filter>, diff --git a/libimagentryfilter/src/ops/not.rs b/libimagentryfilter/src/ops/not.rs index a709d95b..0b32b1b9 100644 --- a/libimagentryfilter/src/ops/not.rs +++ b/libimagentryfilter/src/ops/not.rs @@ -1,6 +1,6 @@ use libimagstore::store::Entry; -use filter::Filter; +use filters::filter::Filter; pub struct Not { a: Box<Filter> diff --git a/libimagentryfilter/src/ops/or.rs b/libimagentryfilter/src/ops/or.rs index e2ca810b..83884a83 100644 --- a/libimagentryfilter/src/ops/or.rs +++ b/libimagentryfilter/src/ops/or.rs @@ -1,6 +1,6 @@ use libimagstore::store::Entry; -use filter::Filter; +use filters::filter::Filter; pub struct Or { a: Box<Filter>, diff --git a/libimagentryfilter/src/tags/mod.rs b/libimagentryfilter/src/tags/mod.rs index 8c2d2b4f..8cc2d16e 100644 --- a/libimagentryfilter/src/tags/mod.rs +++ b/libimagentryfilter/src/tags/mod.rs @@ -2,7 +2,7 @@ use libimagstore::store::Entry; use libimagentrytag::tagable::Tagable; use libimagentrytag::tag::Tag; -use filter::Filter; +use filters::filter::Filter; /// Check whether an Entry has a certain tag pub struct HasTag { |