From 24a1dd2556e664f226354a0265e21cfa80b85dc5 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.pellissier-tanon@helsing.ai>
Date: Mon, 10 Jul 2023 14:27:33 +0200
Subject: [PATCH] Applies some recent Clippy lints

---
 lib/spargebra/src/query.rs        |  2 +-
 lib/src/sparql/plan.rs            |  2 +-
 testsuite/benches/parser.rs       | 32 ++++++++++++++++---------------
 testsuite/src/sparql_evaluator.rs |  2 +-
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/lib/spargebra/src/query.rs b/lib/spargebra/src/query.rs
index 9f927a8d..6cb7e57b 100644
--- a/lib/spargebra/src/query.rs
+++ b/lib/spargebra/src/query.rs
@@ -210,7 +210,7 @@ impl fmt::Display for Query {
                     writeln!(f, "BASE <{base_iri}>")?;
                 }
                 write!(f, "CONSTRUCT {{ ")?;
-                for triple in template.iter() {
+                for triple in template {
                     write!(f, "{triple} . ")?;
                 }
                 write!(f, "}}")?;
diff --git a/lib/src/sparql/plan.rs b/lib/src/sparql/plan.rs
index af51e7a4..905e4da0 100644
--- a/lib/src/sparql/plan.rs
+++ b/lib/src/sparql/plan.rs
@@ -155,7 +155,7 @@ impl PlanNode {
                 child.lookup_used_variables(callback);
             }
             Self::Union { children } => {
-                for child in children.iter() {
+                for child in children {
                     child.lookup_used_variables(callback);
                 }
             }
diff --git a/testsuite/benches/parser.rs b/testsuite/benches/parser.rs
index 63638647..ed7205eb 100644
--- a/testsuite/benches/parser.rs
+++ b/testsuite/benches/parser.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::print_stderr)]
+
 use anyhow::Result;
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
 use oxigraph_testsuite::files::read_file;
@@ -40,7 +42,7 @@ fn parse_bench(
     c: &mut Criterion,
     parser_name: &str,
     data_name: &str,
-    data: Vec<u8>,
+    data: &[u8],
     bench: impl Fn(&[u8]),
 ) {
     let mut group = c.benchmark_group(parser_name);
@@ -51,7 +53,7 @@ fn parse_bench(
     group.finish();
 }
 
-fn parse_oxttl_ntriples(c: &mut Criterion, name: &str, data: Vec<u8>) {
+fn parse_oxttl_ntriples(c: &mut Criterion, name: &str, data: &[u8]) {
     parse_bench(c, "oxttl ntriples", name, data, |data| {
         let mut parser = oxttl::NTriplesParser::new().parse();
         parser.extend_from_slice(data);
@@ -62,7 +64,7 @@ fn parse_oxttl_ntriples(c: &mut Criterion, name: &str, data: Vec<u8>) {
     });
 }
 
-fn parse_oxttl_turtle(c: &mut Criterion, name: &str, data: Vec<u8>) {
+fn parse_oxttl_turtle(c: &mut Criterion, name: &str, data: &[u8]) {
     parse_bench(c, "oxttl turtle", name, data, |data| {
         let mut parser = oxttl::TurtleParser::new().parse();
         parser.extend_from_slice(data);
@@ -73,25 +75,25 @@ fn parse_oxttl_turtle(c: &mut Criterion, name: &str, data: Vec<u8>) {
     });
 }
 
-fn parse_rio_ntriples(c: &mut Criterion, name: &str, data: Vec<u8>) {
+fn parse_rio_ntriples(c: &mut Criterion, name: &str, data: &[u8]) {
     parse_bench(c, "rio ntriples", name, data, |data| {
         let mut count: u64 = 0;
         NTriplesParser::new(data)
-            .parse_all(&mut |_| {
+            .parse_all::<TurtleError>(&mut |_| {
                 count += 1;
-                Ok(()) as Result<(), TurtleError>
+                Ok(())
             })
             .unwrap();
     });
 }
 
-fn parse_rio_turtle(c: &mut Criterion, name: &str, data: Vec<u8>) {
+fn parse_rio_turtle(c: &mut Criterion, name: &str, data: &[u8]) {
     parse_bench(c, "rio turtle", name, data, |data| {
         let mut count: u64 = 0;
         TurtleParser::new(data, None)
-            .parse_all(&mut |_| {
+            .parse_all::<TurtleError>(&mut |_| {
                 count += 1;
-                Ok(()) as Result<(), TurtleError>
+                Ok(())
             })
             .unwrap();
     });
@@ -101,7 +103,7 @@ fn bench_parse_oxttl_ntriples_with_ntriples(c: &mut Criterion) {
     parse_oxttl_ntriples(
         c,
         "ntriples",
-        match ntriples_test_data() {
+        &match ntriples_test_data() {
             Ok(d) => d,
             Err(e) => {
                 eprintln!("{e}");
@@ -115,7 +117,7 @@ fn bench_parse_oxttl_ntriples_with_turtle(c: &mut Criterion) {
     parse_oxttl_turtle(
         c,
         "ntriples",
-        match ntriples_test_data() {
+        &match ntriples_test_data() {
             Ok(d) => d,
             Err(e) => {
                 eprintln!("{e}");
@@ -129,7 +131,7 @@ fn bench_parse_oxttl_turtle_with_turtle(c: &mut Criterion) {
     parse_oxttl_turtle(
         c,
         "turtle",
-        match turtle_test_data() {
+        &match turtle_test_data() {
             Ok(d) => d,
             Err(e) => {
                 eprintln!("{e}");
@@ -143,7 +145,7 @@ fn bench_parse_rio_ntriples_with_ntriples(c: &mut Criterion) {
     parse_rio_ntriples(
         c,
         "ntriples",
-        match ntriples_test_data() {
+        &match ntriples_test_data() {
             Ok(d) => d,
             Err(e) => {
                 eprintln!("{e}");
@@ -157,7 +159,7 @@ fn bench_parse_rio_ntriples_with_turtle(c: &mut Criterion) {
     parse_rio_turtle(
         c,
         "ntriples",
-        match ntriples_test_data() {
+        &match ntriples_test_data() {
             Ok(d) => d,
             Err(e) => {
                 eprintln!("{e}");
@@ -171,7 +173,7 @@ fn bench_parse_rio_turtle_with_turtle(c: &mut Criterion) {
     parse_rio_turtle(
         c,
         "turtle",
-        match turtle_test_data() {
+        &match turtle_test_data() {
             Ok(d) => d,
             Err(e) => {
                 eprintln!("{e}");
diff --git a/testsuite/src/sparql_evaluator.rs b/testsuite/src/sparql_evaluator.rs
index e72feaa7..da4f0347 100644
--- a/testsuite/src/sparql_evaluator.rs
+++ b/testsuite/src/sparql_evaluator.rs
@@ -501,7 +501,7 @@ impl StaticQueryResults {
     fn from_graph(graph: &Graph) -> Result<Self> {
         // Hack to normalize literals
         let store = Store::new()?;
-        for t in graph.iter() {
+        for t in graph {
             store
                 .insert(t.in_graph(GraphNameRef::DefaultGraph))
                 .unwrap();