Skip to content

Commit 6f2d2d0

Browse files
chore: fix pre-existing clippy::question_mark lints in indexes and iterators
1 parent 642d18d commit 6f2d2d0

2 files changed

Lines changed: 3 additions & 12 deletions

File tree

src/indexes.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ where D: Dimension
5757
#[inline]
5858
fn next(&mut self) -> Option<Self::Item>
5959
{
60-
let index = match self.index {
61-
None => return None,
62-
Some(ref ix) => ix.clone(),
63-
};
60+
let index = self.index.as_ref()?.clone();
6461
self.index = self.dim.next_for(index.clone());
6562
Some(index.into_pattern())
6663
}

src/iterators/mod.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -512,10 +512,7 @@ impl<'a, A, D: Dimension> Iterator for IndexedIter<'a, A, D>
512512
#[inline]
513513
fn next(&mut self) -> Option<Self::Item>
514514
{
515-
let index = match self.0.inner.index {
516-
None => return None,
517-
Some(ref ix) => ix.clone(),
518-
};
515+
let index = self.0.inner.index.as_ref()?.clone();
519516
match self.0.next() {
520517
None => None,
521518
Some(elem) => Some((index.into_pattern(), elem)),
@@ -695,10 +692,7 @@ impl<'a, A, D: Dimension> Iterator for IndexedIterMut<'a, A, D>
695692
#[inline]
696693
fn next(&mut self) -> Option<Self::Item>
697694
{
698-
let index = match self.0.inner.index {
699-
None => return None,
700-
Some(ref ix) => ix.clone(),
701-
};
695+
let index = self.0.inner.index.as_ref()?.clone();
702696
match self.0.next() {
703697
None => None,
704698
Some(elem) => Some((index.into_pattern(), elem)),

0 commit comments

Comments
 (0)