summaryrefslogtreecommitdiffstats
path: root/libimagentryfilter
diff options
context:
space:
mode:
authorGavin Thomas Claugus <gclaugus@gmail.com>2016-08-14 14:28:17 -0400
committerGavin Thomas Claugus <gclaugus@gmail.com>2016-08-14 15:17:30 -0400
commit0b94490e81114ce112c9513bbd4a7c9e83885384 (patch)
tree67c87fbdb5275fbcebf82f5924ae49424b9b85bd /libimagentryfilter
parent381cec0ccaf37b9f08db8040b814288188be2e97 (diff)
libimagentryfilter: Update VersionInRange
Signed-off-by: Gavin Thomas Claugus <gclaugus@gmail.com>
Diffstat (limited to 'libimagentryfilter')
-rw-r--r--libimagentryfilter/src/builtin/header/version/range.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/libimagentryfilter/src/builtin/header/version/range.rs b/libimagentryfilter/src/builtin/header/version/range.rs
index f049a00f..66ccbcd8 100644
--- a/libimagentryfilter/src/builtin/header/version/range.rs
+++ b/libimagentryfilter/src/builtin/header/version/range.rs
@@ -5,17 +5,17 @@ use libimagstore::store::Entry;
use builtin::header::version::gt::VersionGt;
use builtin::header::version::lt::VersionLt;
use filters::filter::Filter;
-use ops::and::And;
-use ops::not::Not;
+use filters::ops::and::And;
+use filters::ops::not::Not;
pub struct VersionInRange {
- and: And,
+ and: And<VersionGt, VersionLt>,
}
impl VersionInRange {
pub fn new(lowerbound: Version, upperbound: Version) -> VersionInRange {
- VersionInRange { and: VersionGt::new(lowerbound).and(Box::new(VersionLt::new(upperbound))) }
+ VersionInRange { and: VersionGt::new(lowerbound).and(VersionLt::new(upperbound)) }
}
}
@@ -29,7 +29,7 @@ impl Filter<Entry> for VersionInRange {
}
pub struct VersionOutOfRange {
- not: Not
+ not: Not<VersionInRange>
}
impl VersionOutOfRange {