Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions src/groupbylazy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,11 @@ where

while let Some(elt) = self.next_element() {
let key = self.key.call_mut(&elt);
match self.current_key.take() {
None => {}
Some(old_key) => {
if old_key != key {
self.current_key = Some(key);
first_elt = Some(elt);
break;
}
if let Some(old_key) = self.current_key.take() {
if old_key != key {
self.current_key = Some(key);
first_elt = Some(elt);
break;
}
}
self.current_key = Some(key);
Expand Down Expand Up @@ -248,15 +245,12 @@ where
None => None,
Some(elt) => {
let key = self.key.call_mut(&elt);
match self.current_key.take() {
None => {}
Some(old_key) => {
if old_key != key {
self.current_key = Some(key);
self.current_elt = Some(elt);
self.top_group += 1;
return None;
}
if let Some(old_key) = self.current_key.take() {
if old_key != key {
self.current_key = Some(key);
self.current_elt = Some(elt);
self.top_group += 1;
return None;
}
}
self.current_key = Some(key);
Expand Down
Loading