Skip to content

Commit 0b32de5

Browse files
committed
fix clippy::if_not_else
1 parent 770488b commit 0b32de5

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

src/combinations_with_replacement.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ where
6363
fn next(&mut self) -> Option<Self::Item> {
6464
// If this is the first iteration, return early
6565
if self.first {
66-
// In empty edge cases, stop iterating immediately
67-
return if !(self.indices.is_empty() || self.pool.get_next()) {
68-
None
69-
// Otherwise, yield the initial state
70-
} else {
66+
return if self.indices.is_empty() || self.pool.get_next() {
67+
// yield the initial state
7168
self.first = false;
7269
Some(self.current())
70+
} else {
71+
// In empty edge cases, stop iterating immediately
72+
None
7373
};
7474
}
7575

src/minmax.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ pub fn minmax_impl<I, K, F, L>(mut it: I, mut key_for: F,
6060
Some(y) => {
6161
let xk = key_for(&x);
6262
let yk = key_for(&y);
63-
if !lt(&y, &x, &yk, &xk) {(x, y, xk, yk)} else {(y, x, yk, xk)}
63+
if lt(&y, &x, &yk, &xk) {(y, x, yk, xk)} else {(x, y, xk, yk)}
6464
}
6565
}
6666
}
@@ -90,16 +90,7 @@ pub fn minmax_impl<I, K, F, L>(mut it: I, mut key_for: F,
9090
};
9191
let first_key = key_for(&first);
9292
let second_key = key_for(&second);
93-
if !lt(&second, &first, &second_key, &first_key) {
94-
if lt(&first, &min, &first_key, &min_key) {
95-
min = first;
96-
min_key = first_key;
97-
}
98-
if !lt(&second, &max, &second_key, &max_key) {
99-
max = second;
100-
max_key = second_key;
101-
}
102-
} else {
93+
if lt(&second, &first, &second_key, &first_key) {
10394
if lt(&second, &min, &second_key, &min_key) {
10495
min = second;
10596
min_key = second_key;
@@ -108,6 +99,15 @@ pub fn minmax_impl<I, K, F, L>(mut it: I, mut key_for: F,
10899
max = first;
109100
max_key = first_key;
110101
}
102+
} else {
103+
if lt(&first, &min, &first_key, &min_key) {
104+
min = first;
105+
min_key = first_key;
106+
}
107+
if !lt(&second, &max, &second_key, &max_key) {
108+
max = second;
109+
max_key = second_key;
110+
}
111111
}
112112
}
113113

src/with_position.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,14 @@ impl<I: Iterator> Iterator for WithPosition<I> {
6464
fn next(&mut self) -> Option<Self::Item> {
6565
match self.peekable.next() {
6666
Some(item) => {
67-
if !self.handled_first {
67+
if self.handled_first {
68+
// Have seen the first item, and there's something left.
69+
// Peek to see if this is the last item.
70+
match self.peekable.peek() {
71+
Some(_) => Some(Position::Middle(item)),
72+
None => Some(Position::Last(item)),
73+
}
74+
} else {
6875
// Haven't seen the first item yet, and there is one to give.
6976
self.handled_first = true;
7077
// Peek to see if this is also the last item,
@@ -73,13 +80,6 @@ impl<I: Iterator> Iterator for WithPosition<I> {
7380
Some(_) => Some(Position::First(item)),
7481
None => Some(Position::Only(item)),
7582
}
76-
} else {
77-
// Have seen the first item, and there's something left.
78-
// Peek to see if this is the last item.
79-
match self.peekable.peek() {
80-
Some(_) => Some(Position::Middle(item)),
81-
None => Some(Position::Last(item)),
82-
}
8383
}
8484
}
8585
// Iterator is finished.

0 commit comments

Comments
 (0)