Skip to content

Commit 4a6e96c

Browse files
committed
Remove usage of filter_drain on nightly 2023-09-22
Effectively renamed filter_drain -> extract_if
1 parent 5494558 commit 4a6e96c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

libs/simple/src/lib.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@
3232
const_align_of_val,
3333
// Needed for field_offset!
3434
const_refs_to_cell,
35+
// Used instead of drain_filter
36+
extract_if,
3537
)]
36-
#![feature(drain_filter)]
3738
#![allow(
3839
/*
3940
* TODO: Should we be relying on vtable address stability?
@@ -525,7 +526,7 @@ impl SimpleAlloc {
525526
let mut actual_size = 0;
526527
// Clear small arenas
527528
let was_mark_inverted = self.mark_inverted.load(Ordering::SeqCst);
528-
self.small_objects.lock().drain_filter(|&mut common_header| {
529+
self.small_objects.lock().extract_if(|&mut common_header| {
529530
let total_size = (*common_header).type_info.determine_total_size(common_header);
530531
match (*common_header).raw_mark_state().resolve(was_mark_inverted) {
531532
MarkState::White => {
@@ -556,7 +557,7 @@ impl SimpleAlloc {
556557
});
557558
// Clear large objects
558559
debug_assert_eq!(was_mark_inverted, self.mark_inverted());
559-
self.big_objects.lock().drain_filter(|big_item| {
560+
self.big_objects.lock().extract_if(|big_item| {
560561
let total_size = big_item.header().type_info.determine_total_size(big_item.header.as_ptr());
561562
match big_item.header().mark_data.load_snapshot().state.resolve(was_mark_inverted) {
562563
MarkState::White => {

0 commit comments

Comments
 (0)