From 52bb5274cd4c8b1bc878ff7d6906304e58fc8ff7 Mon Sep 17 00:00:00 2001
From: Tpt <thomaspt@hotmail.fr>
Date: Thu, 27 Feb 2020 18:06:27 +0100
Subject: [PATCH] Enforces Rust 2018 idioms

---
 lib/src/lib.rs         |  2 +-
 lib/src/sparql/eval.rs | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/src/lib.rs b/lib/src/lib.rs
index 51dee0fa..d953721a 100644
--- a/lib/src/lib.rs
+++ b/lib/src/lib.rs
@@ -37,7 +37,7 @@
 #![deny(
     future_incompatible,
     nonstandard_style,
-    //TODO rust_2018_idioms,
+    rust_2018_idioms,
     missing_copy_implementations,
     trivial_casts,
     trivial_numeric_casts,
diff --git a/lib/src/sparql/eval.rs b/lib/src/sparql/eval.rs
index 79c74482..64313c29 100644
--- a/lib/src/sparql/eval.rs
+++ b/lib/src/sparql/eval.rs
@@ -2029,7 +2029,7 @@ impl<'a> Iterator for AntiJoinIterator<'a> {
     }
 }
 
-struct LeftJoinIterator<'a, S: StoreConnection + 'a> {
+struct LeftJoinIterator<'a, S: StoreConnection> {
     eval: &'a SimpleEvaluator<S>,
     right_plan: &'a PlanNode,
     left_iter: EncodedTuplesIterator<'a>,
@@ -2093,7 +2093,7 @@ impl<'a, S: StoreConnection> Iterator for BadLeftJoinIterator<'a, S> {
     }
 }
 
-struct UnionIterator<'a, S: StoreConnection + 'a> {
+struct UnionIterator<'a, S: StoreConnection> {
     eval: &'a SimpleEvaluator<S>,
     plans: &'a [PlanNode],
     input: EncodedTuple,
@@ -2120,7 +2120,7 @@ impl<'a, S: StoreConnection> Iterator for UnionIterator<'a, S> {
     }
 }
 
-struct ConstructIterator<'a, S: StoreConnection + 'a> {
+struct ConstructIterator<'a, S: StoreConnection> {
     eval: &'a SimpleEvaluator<S>,
     iter: EncodedTuplesIterator<'a>,
     template: &'a [TripleTemplate],
@@ -2191,7 +2191,7 @@ fn decode_triple(
     ))
 }
 
-struct DescribeIterator<'a, S: StoreConnection + 'a> {
+struct DescribeIterator<'a, S: StoreConnection> {
     eval: &'a SimpleEvaluator<S>,
     iter: EncodedTuplesIterator<'a>,
     quads: Box<dyn Iterator<Item = Result<EncodedQuad>> + 'a>,
@@ -2486,7 +2486,7 @@ impl Accumulator for AvgAccumulator {
 }
 
 #[allow(clippy::option_option)]
-struct MinAccumulator<'a, S: StoreConnection + 'a> {
+struct MinAccumulator<'a, S: StoreConnection> {
     eval: &'a SimpleEvaluator<S>,
     min: Option<Option<EncodedTerm>>,
 }
@@ -2514,7 +2514,7 @@ impl<'a, S: StoreConnection + 'a> Accumulator for MinAccumulator<'a, S> {
 }
 
 #[allow(clippy::option_option)]
-struct MaxAccumulator<'a, S: StoreConnection + 'a> {
+struct MaxAccumulator<'a, S: StoreConnection> {
     eval: &'a SimpleEvaluator<S>,
     max: Option<Option<EncodedTerm>>,
 }
@@ -2559,7 +2559,7 @@ impl Accumulator for SampleAccumulator {
 }
 
 #[allow(clippy::option_option)]
-struct GroupConcatAccumulator<'a, S: StoreConnection + 'a> {
+struct GroupConcatAccumulator<'a, S: StoreConnection> {
     eval: &'a SimpleEvaluator<S>,
     concat: Option<String>,
     language: Option<Option<u128>>,