From dcc877364aee8c675c9da840bc79cc45f37fb3ca Mon Sep 17 00:00:00 2001
From: Magnus Ulimoen <magnusu@met.no>
Date: Thu, 10 Oct 2024 10:09:22 +0200
Subject: [PATCH] Clippy lints

---
 src/extent.rs              | 4 ++--
 src/idx/dataset/any.rs     | 2 +-
 src/idx/dataset/dataset.rs | 4 ++--
 src/reader/cache.rs        | 2 +-
 src/reader/direct.rs       | 4 ++--
 src/reader/stream.rs       | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/extent.rs b/src/extent.rs
index ba7bb32..946734f 100644
--- a/src/extent.rs
+++ b/src/extent.rs
@@ -383,7 +383,7 @@ enum ExtentIterator<'a> {
     Extents(std::iter::Zip<std::slice::Iter<'a, Extent>, std::slice::Iter<'a, u64>>),
 }
 
-impl<'a> Iterator for ExtentIterator<'a> {
+impl Iterator for ExtentIterator<'_> {
     type Item = Extent;
     fn next(&mut self) -> Option<Self::Item> {
         match self {
@@ -395,7 +395,7 @@ impl<'a> Iterator for ExtentIterator<'a> {
     }
 }
 
-impl<'a> DoubleEndedIterator for ExtentIterator<'a> {
+impl DoubleEndedIterator for ExtentIterator<'_> {
     fn next_back(&mut self) -> Option<Self::Item> {
         match self {
             Self::All(iter) => iter
diff --git a/src/idx/dataset/any.rs b/src/idx/dataset/any.rs
index fa16c70..49cb9cb 100644
--- a/src/idx/dataset/any.rs
+++ b/src/idx/dataset/any.rs
@@ -121,7 +121,7 @@ pub trait DatasetExt {
     fn as_par_reader(&self, p: &dyn AsRef<Path>) -> anyhow::Result<Box<dyn DatasetExtReader + '_>>;
 }
 
-impl<'a> DatasetExt for DatasetD<'a> {
+impl DatasetExt for DatasetD<'_> {
     fn size(&self) -> usize {
         self.inner().size()
     }
diff --git a/src/idx/dataset/dataset.rs b/src/idx/dataset/dataset.rs
index 825cd2c..94b486b 100644
--- a/src/idx/dataset/dataset.rs
+++ b/src/idx/dataset/dataset.rs
@@ -139,7 +139,7 @@ impl<const D: usize> Dataset<'_, D> {
             let expected_chunks = shape
                 .iter()
                 .zip(&chunk_shape)
-                .map(|(s, c)| (s + (c - 1)) / c)
+                .map(|(s, c)| s.div_ceil(*c))
                 .product::<u64>() as usize;
 
             ensure!(
@@ -194,7 +194,7 @@ impl<const D: usize> Dataset<'_, D> {
             let mut d = shape
                 .iter()
                 .zip(&chunk_shape)
-                .map(|(d, z)| (d + (z - 1)) / z)
+                .map(|(d, z)| d.div_ceil(*z))
                 .rev()
                 .scan(1, |p, c| {
                     let sz = *p;
diff --git a/src/reader/cache.rs b/src/reader/cache.rs
index bd839cc..8201c8d 100644
--- a/src/reader/cache.rs
+++ b/src/reader/cache.rs
@@ -31,7 +31,7 @@ impl<'a, R: Read + Seek, const D: usize> CacheReader<'a, R, D> {
     }
 }
 
-impl<'a, R: Read + Seek, const D: usize> Reader for CacheReader<'a, R, D> {
+impl<R: Read + Seek, const D: usize> Reader for CacheReader<'_, R, D> {
     fn order(&self) -> Order {
         self.ds.order
     }
diff --git a/src/reader/direct.rs b/src/reader/direct.rs
index 547d146..9639d04 100644
--- a/src/reader/direct.rs
+++ b/src/reader/direct.rs
@@ -31,7 +31,7 @@ impl<'a, const D: usize> Direct<'a, D> {
     }
 }
 
-impl<'a, const D: usize> ParReader for Direct<'a, D> {
+impl<const D: usize> ParReader for Direct<'_, D> {
     fn read_to_par(&self, extents: &Extents, dst: &mut [u8]) -> Result<usize, anyhow::Error> {
         use rayon::prelude::*;
 
@@ -97,7 +97,7 @@ impl<'a, const D: usize> ParReader for Direct<'a, D> {
     }
 }
 
-impl<'a, const D: usize> Reader for Direct<'a, D> {
+impl<const D: usize> Reader for Direct<'_, D> {
     fn order(&self) -> Order {
         self.ds.order
     }
diff --git a/src/reader/stream.rs b/src/reader/stream.rs
index a9c047c..32b02d8 100644
--- a/src/reader/stream.rs
+++ b/src/reader/stream.rs
@@ -40,7 +40,7 @@ impl<'a, const D: usize> StreamReader<'a, D> {
     }
 }
 
-impl<'a, const D: usize> Streamer for StreamReader<'a, D> {
+impl<const D: usize> Streamer for StreamReader<'_, D> {
     fn dsize(&self) -> usize {
         self.ds.dsize
     }