From 9f1db4a8314c874d5b18826900b34fc6673fa11d Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Tue, 26 Mar 2024 10:08:26 +0100
Subject: [PATCH] Make CI green again (#768)

* Force clap version to 4.4.9 to respect MSRV

Version of clap above 4.4.9 require Rust 1.74, which exceeds
criterion's MSRV of 1.70.

* Do not redundantly import `std::iter::IntoIterator`

Rust now warns about duplicate imports. `std::iter::IntoIterator` is
part of the Rust prelude since Rust 2015. This prevents
`criterion-plot` from compiling with recent Rust versions because of
`#![deny(warnings)]`.
---
 Cargo.toml              | 2 +-
 plot/src/axis.rs        | 1 -
 plot/src/candlestick.rs | 1 -
 plot/src/curve.rs       | 1 -
 plot/src/errorbar.rs    | 1 -
 plot/src/filledcurve.rs | 1 -
 6 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b19af36df..067335559 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,7 @@ serde          = "1.0"
 serde_json     = "1.0"
 serde_derive   = "1.0"
 ciborium       = "0.2.0"
-clap           = { version = "4", default-features = false, features = ["std", "help"] }
+clap           = { version = "=4.4.9", default-features = false, features = ["std", "help"] }
 walkdir        = "2.3"
 tinytemplate   = "1.1"
 cast           = "0.3"
diff --git a/plot/src/axis.rs b/plot/src/axis.rs
index 5f7ae4947..e348cd844 100644
--- a/plot/src/axis.rs
+++ b/plot/src/axis.rs
@@ -1,7 +1,6 @@
 //! Coordinate axis
 
 use std::borrow::Cow;
-use std::iter::IntoIterator;
 
 use crate::map;
 use crate::traits::{Configure, Data, Set};
diff --git a/plot/src/candlestick.rs b/plot/src/candlestick.rs
index e0a5cbebc..ff2c0be04 100644
--- a/plot/src/candlestick.rs
+++ b/plot/src/candlestick.rs
@@ -1,7 +1,6 @@
 //! "Candlestick" plots
 
 use std::borrow::Cow;
-use std::iter::IntoIterator;
 
 use crate::data::Matrix;
 use crate::traits::{self, Data, Set};
diff --git a/plot/src/curve.rs b/plot/src/curve.rs
index bbddeff1a..3c2b68ae3 100644
--- a/plot/src/curve.rs
+++ b/plot/src/curve.rs
@@ -1,7 +1,6 @@
 //! Simple "curve" like plots
 
 use std::borrow::Cow;
-use std::iter::IntoIterator;
 
 use crate::data::Matrix;
 use crate::traits::{self, Data, Set};
diff --git a/plot/src/errorbar.rs b/plot/src/errorbar.rs
index 7efd23e3d..e8c73a67a 100644
--- a/plot/src/errorbar.rs
+++ b/plot/src/errorbar.rs
@@ -1,7 +1,6 @@
 //! Error bar plots
 
 use std::borrow::Cow;
-use std::iter::IntoIterator;
 
 use crate::data::Matrix;
 use crate::traits::{self, Data, Set};
diff --git a/plot/src/filledcurve.rs b/plot/src/filledcurve.rs
index f79dbddce..bc54082eb 100644
--- a/plot/src/filledcurve.rs
+++ b/plot/src/filledcurve.rs
@@ -1,7 +1,6 @@
 //! Filled curve plots
 
 use std::borrow::Cow;
-use std::iter::IntoIterator;
 
 use crate::data::Matrix;
 use crate::traits::{self, Data, Set};