Skip to content

Commit 33a289d

Browse files
fix: revert GridIntoIterator to pop() since ordering is not guaranteed; fix fmt
Co-authored-by: samueltardieu <44656+samueltardieu@users.noreply.github.com>
1 parent 2ff7917 commit 33a289d

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

src/grid.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -579,13 +579,7 @@ impl Iterator for GridIntoIterator {
579579
}
580580
}
581581
} else {
582-
self.grid
583-
.exclusions
584-
.get_index(self.x)
585-
.inspect(|_| {
586-
self.x += 1;
587-
})
588-
.copied()
582+
self.grid.exclusions.pop()
589583
}
590584
}
591585
}

tests/grid.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -641,15 +641,7 @@ fn iter_dense_grid_yields_exact_vertices() {
641641
g.fill();
642642
g.remove_vertex((1, 0));
643643
g.remove_vertex((0, 2));
644-
let mut expected = vec![
645-
(0, 0),
646-
(2, 0),
647-
(0, 1),
648-
(1, 1),
649-
(2, 1),
650-
(1, 2),
651-
(2, 2),
652-
];
644+
let mut expected = vec![(0, 0), (2, 0), (0, 1), (1, 1), (2, 1), (1, 2), (2, 2)];
653645
expected.sort_unstable();
654646
let mut via_iter = g.iter().collect::<Vec<_>>();
655647
via_iter.sort_unstable();

0 commit comments

Comments
 (0)