From 0b94490e81114ce112c9513bbd4a7c9e83885384 Mon Sep 17 00:00:00 2001
From: Gavin Thomas Claugus <gclaugus@gmail.com>
Date: Sun, 14 Aug 2016 14:28:17 -0400
Subject: [PATCH] libimagentryfilter: Update VersionInRange

Signed-off-by: Gavin Thomas Claugus <gclaugus@gmail.com>
---
 libimagentryfilter/src/builtin/header/version/range.rs | 10 +++++-----
 1 file 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 {