From a769186cd72de3bc2ee6cda58876e7ca11b53aad Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 7 Apr 2018 12:09:01 +0200 Subject: [PATCH] Make iterator lifetimes less restricting --- lib/core/libimagstore/src/iter.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/core/libimagstore/src/iter.rs b/lib/core/libimagstore/src/iter.rs index b5d82348..0171a93b 100644 --- a/lib/core/libimagstore/src/iter.rs +++ b/lib/core/libimagstore/src/iter.rs @@ -32,10 +32,10 @@ macro_rules! mk_iterator { use store::Store; use error::Result; - pub struct $itername<'a>(Box>, &'a Store); + pub struct $itername<'a>(Box + 'a>, &'a Store); impl<'a> $itername<'a> { - pub fn new(inner: Box>, store: &'a Store) -> Self { + pub fn new(inner: Box + 'a>, store: &'a Store) -> Self { $itername(inner, store) } } @@ -53,7 +53,7 @@ macro_rules! mk_iterator { } impl<'a, I> $extname<'a> for I - where I: Iterator + 'static + where I: Iterator + 'a { fn $extfnname(self, store: &'a Store) -> $itername<'a> { $itername(Box::new(self), store)