summaryrefslogtreecommitdiffstats
path: root/library/alloc/tests
diff options
context:
space:
mode:
Diffstat (limited to 'library/alloc/tests')
-rw-r--r--library/alloc/tests/autotraits.rs6
-rw-r--r--library/alloc/tests/lib.rs4
-rw-r--r--library/alloc/tests/slice.rs1
-rw-r--r--library/alloc/tests/str.rs2
-rw-r--r--library/alloc/tests/string.rs1
-rw-r--r--library/alloc/tests/vec.rs87
-rw-r--r--library/alloc/tests/vec_deque.rs3
7 files changed, 47 insertions, 57 deletions
diff --git a/library/alloc/tests/autotraits.rs b/library/alloc/tests/autotraits.rs
index 879e32b3f..6a8e55bff 100644
--- a/library/alloc/tests/autotraits.rs
+++ b/library/alloc/tests/autotraits.rs
@@ -55,7 +55,7 @@ fn test_btree_map() {
require_send_sync(async {
let _v = None::<
- alloc::collections::btree_map::DrainFilter<
+ alloc::collections::btree_map::ExtractIf<
'_,
&u32,
&u32,
@@ -149,7 +149,7 @@ fn test_btree_set() {
});
require_send_sync(async {
- let _v = None::<alloc::collections::btree_set::DrainFilter<'_, &u32, fn(&&u32) -> bool>>;
+ let _v = None::<alloc::collections::btree_set::ExtractIf<'_, &u32, fn(&&u32) -> bool>>;
async {}.await;
});
@@ -238,7 +238,7 @@ fn test_linked_list() {
/*
require_send_sync(async {
let _v =
- None::<alloc::collections::linked_list::DrainFilter<'_, &u32, fn(&mut &u32) -> bool>>;
+ None::<alloc::collections::linked_list::ExtractIf<'_, &u32, fn(&mut &u32) -> bool>>;
async {}.await;
});
*/
diff --git a/library/alloc/tests/lib.rs b/library/alloc/tests/lib.rs
index 0eca4c9bb..aa7a331b3 100644
--- a/library/alloc/tests/lib.rs
+++ b/library/alloc/tests/lib.rs
@@ -1,7 +1,7 @@
#![feature(allocator_api)]
#![feature(alloc_layout_extra)]
#![feature(assert_matches)]
-#![feature(btree_drain_filter)]
+#![feature(btree_extract_if)]
#![feature(cow_is_borrowed)]
#![feature(const_cow_is_borrowed)]
#![feature(const_heap)]
@@ -10,7 +10,7 @@
#![feature(const_ptr_write)]
#![feature(const_try)]
#![feature(core_intrinsics)]
-#![feature(drain_filter)]
+#![feature(extract_if)]
#![feature(exact_size_is_empty)]
#![feature(linked_list_cursors)]
#![feature(map_try_insert)]
diff --git a/library/alloc/tests/slice.rs b/library/alloc/tests/slice.rs
index 9aa5575ca..784839a3f 100644
--- a/library/alloc/tests/slice.rs
+++ b/library/alloc/tests/slice.rs
@@ -1418,6 +1418,7 @@ fn test_box_slice_clone() {
#[test]
#[allow(unused_must_use)] // here, we care about the side effects of `.clone()`
#[cfg_attr(target_os = "emscripten", ignore)]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn test_box_slice_clone_panics() {
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc;
diff --git a/library/alloc/tests/str.rs b/library/alloc/tests/str.rs
index c1dbbde08..0ba5d088f 100644
--- a/library/alloc/tests/str.rs
+++ b/library/alloc/tests/str.rs
@@ -1,3 +1,5 @@
+#![cfg_attr(not(bootstrap), allow(invalid_from_utf8))]
+
use std::assert_matches::assert_matches;
use std::borrow::Cow;
use std::cmp::Ordering::{Equal, Greater, Less};
diff --git a/library/alloc/tests/string.rs b/library/alloc/tests/string.rs
index 99d1296a4..17d56d491 100644
--- a/library/alloc/tests/string.rs
+++ b/library/alloc/tests/string.rs
@@ -394,6 +394,7 @@ fn test_remove_matches() {
}
#[test]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn test_retain() {
let mut s = String::from("α_β_γ");
diff --git a/library/alloc/tests/vec.rs b/library/alloc/tests/vec.rs
index cc4c1f127..ddd93e9a4 100644
--- a/library/alloc/tests/vec.rs
+++ b/library/alloc/tests/vec.rs
@@ -314,6 +314,7 @@ fn test_retain_predicate_order() {
}
#[test]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn test_retain_pred_panic_with_hole() {
let v = (0..5).map(Rc::new).collect::<Vec<_>>();
catch_unwind(AssertUnwindSafe(|| {
@@ -331,6 +332,7 @@ fn test_retain_pred_panic_with_hole() {
}
#[test]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn test_retain_pred_panic_no_hole() {
let v = (0..5).map(Rc::new).collect::<Vec<_>>();
catch_unwind(AssertUnwindSafe(|| {
@@ -346,6 +348,7 @@ fn test_retain_pred_panic_no_hole() {
}
#[test]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn test_retain_drop_panic() {
struct Wrap(Rc<i32>);
@@ -806,6 +809,7 @@ fn test_drain_end_overflow() {
}
#[test]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn test_drain_leak() {
static mut DROPS: i32 = 0;
@@ -1038,6 +1042,7 @@ fn test_into_iter_clone() {
}
#[test]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn test_into_iter_leak() {
static mut DROPS: i32 = 0;
@@ -1195,6 +1200,7 @@ fn test_from_iter_specialization_head_tail_drop() {
}
#[test]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn test_from_iter_specialization_panic_during_iteration_drops() {
let drop_count: Vec<_> = (0..=2).map(|_| Rc::new(())).collect();
let src: Vec<_> = drop_count.iter().cloned().collect();
@@ -1219,6 +1225,7 @@ fn test_from_iter_specialization_panic_during_iteration_drops() {
}
#[test]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn test_from_iter_specialization_panic_during_drop_doesnt_leak() {
static mut DROP_COUNTER_OLD: [usize; 5] = [0; 5];
static mut DROP_COUNTER_NEW: [usize; 2] = [0; 2];
@@ -1340,11 +1347,11 @@ fn overaligned_allocations() {
}
#[test]
-fn drain_filter_empty() {
+fn extract_if_empty() {
let mut vec: Vec<i32> = vec![];
{
- let mut iter = vec.drain_filter(|_| true);
+ let mut iter = vec.extract_if(|_| true);
assert_eq!(iter.size_hint(), (0, Some(0)));
assert_eq!(iter.next(), None);
assert_eq!(iter.size_hint(), (0, Some(0)));
@@ -1356,12 +1363,12 @@ fn drain_filter_empty() {
}
#[test]
-fn drain_filter_zst() {
+fn extract_if_zst() {
let mut vec = vec![(), (), (), (), ()];
let initial_len = vec.len();
let mut count = 0;
{
- let mut iter = vec.drain_filter(|_| true);
+ let mut iter = vec.extract_if(|_| true);
assert_eq!(iter.size_hint(), (0, Some(initial_len)));
while let Some(_) = iter.next() {
count += 1;
@@ -1378,13 +1385,13 @@ fn drain_filter_zst() {
}
#[test]
-fn drain_filter_false() {
+fn extract_if_false() {
let mut vec = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
let initial_len = vec.len();
let mut count = 0;
{
- let mut iter = vec.drain_filter(|_| false);
+ let mut iter = vec.extract_if(|_| false);
assert_eq!(iter.size_hint(), (0, Some(initial_len)));
for _ in iter.by_ref() {
count += 1;
@@ -1400,13 +1407,13 @@ fn drain_filter_false() {
}
#[test]
-fn drain_filter_true() {
+fn extract_if_true() {
let mut vec = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
let initial_len = vec.len();
let mut count = 0;
{
- let mut iter = vec.drain_filter(|_| true);
+ let mut iter = vec.extract_if(|_| true);
assert_eq!(iter.size_hint(), (0, Some(initial_len)));
while let Some(_) = iter.next() {
count += 1;
@@ -1423,7 +1430,7 @@ fn drain_filter_true() {
}
#[test]
-fn drain_filter_complex() {
+fn extract_if_complex() {
{
// [+xxx++++++xxxxx++++x+x++]
let mut vec = vec![
@@ -1431,7 +1438,7 @@ fn drain_filter_complex() {
39,
];
- let removed = vec.drain_filter(|x| *x % 2 == 0).collect::<Vec<_>>();
+ let removed = vec.extract_if(|x| *x % 2 == 0).collect::<Vec<_>>();
assert_eq!(removed.len(), 10);
assert_eq!(removed, vec![2, 4, 6, 18, 20, 22, 24, 26, 34, 36]);
@@ -1445,7 +1452,7 @@ fn drain_filter_complex() {
2, 4, 6, 7, 9, 11, 13, 15, 17, 18, 20, 22, 24, 26, 27, 29, 31, 33, 34, 35, 36, 37, 39,
];
- let removed = vec.drain_filter(|x| *x % 2 == 0).collect::<Vec<_>>();
+ let removed = vec.extract_if(|x| *x % 2 == 0).collect::<Vec<_>>();
assert_eq!(removed.len(), 10);
assert_eq!(removed, vec![2, 4, 6, 18, 20, 22, 24, 26, 34, 36]);
@@ -1458,7 +1465,7 @@ fn drain_filter_complex() {
let mut vec =
vec![2, 4, 6, 7, 9, 11, 13, 15, 17, 18, 20, 22, 24, 26, 27, 29, 31, 33, 34, 35, 36];
- let removed = vec.drain_filter(|x| *x % 2 == 0).collect::<Vec<_>>();
+ let removed = vec.extract_if(|x| *x % 2 == 0).collect::<Vec<_>>();
assert_eq!(removed.len(), 10);
assert_eq!(removed, vec![2, 4, 6, 18, 20, 22, 24, 26, 34, 36]);
@@ -1470,7 +1477,7 @@ fn drain_filter_complex() {
// [xxxxxxxxxx+++++++++++]
let mut vec = vec![2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19];
- let removed = vec.drain_filter(|x| *x % 2 == 0).collect::<Vec<_>>();
+ let removed = vec.extract_if(|x| *x % 2 == 0).collect::<Vec<_>>();
assert_eq!(removed.len(), 10);
assert_eq!(removed, vec![2, 4, 6, 8, 10, 12, 14, 16, 18, 20]);
@@ -1482,7 +1489,7 @@ fn drain_filter_complex() {
// [+++++++++++xxxxxxxxxx]
let mut vec = vec![1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20];
- let removed = vec.drain_filter(|x| *x % 2 == 0).collect::<Vec<_>>();
+ let removed = vec.extract_if(|x| *x % 2 == 0).collect::<Vec<_>>();
assert_eq!(removed.len(), 10);
assert_eq!(removed, vec![2, 4, 6, 8, 10, 12, 14, 16, 18, 20]);
@@ -1494,7 +1501,8 @@ fn drain_filter_complex() {
// FIXME: re-enable emscripten once it can unwind again
#[test]
#[cfg(not(target_os = "emscripten"))]
-fn drain_filter_consumed_panic() {
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
+fn extract_if_consumed_panic() {
use std::rc::Rc;
use std::sync::Mutex;
@@ -1529,9 +1537,9 @@ fn drain_filter_consumed_panic() {
}
c.index < 6
};
- let drain = data.drain_filter(filter);
+ let drain = data.extract_if(filter);
- // NOTE: The DrainFilter is explicitly consumed
+ // NOTE: The ExtractIf is explicitly consumed
drain.for_each(drop);
});
@@ -1546,7 +1554,8 @@ fn drain_filter_consumed_panic() {
// FIXME: Re-enable emscripten once it can catch panics
#[test]
#[cfg(not(target_os = "emscripten"))]
-fn drain_filter_unconsumed_panic() {
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
+fn extract_if_unconsumed_panic() {
use std::rc::Rc;
use std::sync::Mutex;
@@ -1581,9 +1590,9 @@ fn drain_filter_unconsumed_panic() {
}
c.index < 6
};
- let _drain = data.drain_filter(filter);
+ let _drain = data.extract_if(filter);
- // NOTE: The DrainFilter is dropped without being consumed
+ // NOTE: The ExtractIf is dropped without being consumed
});
let drop_counts = drop_counts.lock().unwrap();
@@ -1595,40 +1604,11 @@ fn drain_filter_unconsumed_panic() {
}
#[test]
-fn drain_filter_unconsumed() {
+fn extract_if_unconsumed() {
let mut vec = vec![1, 2, 3, 4];
- let drain = vec.drain_filter(|&mut x| x % 2 != 0);
+ let drain = vec.extract_if(|&mut x| x % 2 != 0);
drop(drain);
- assert_eq!(vec, [2, 4]);
-}
-
-#[test]
-fn test_drain_filter_keep_rest() {
- let mut v = vec![0, 1, 2, 3, 4, 5, 6];
- let mut drain = v.drain_filter(|&mut x| x % 2 == 0);
- assert_eq!(drain.next(), Some(0));
- assert_eq!(drain.next(), Some(2));
-
- drain.keep_rest();
- assert_eq!(v, &[1, 3, 4, 5, 6]);
-}
-
-#[test]
-fn test_drain_filter_keep_rest_all() {
- let mut v = vec![0, 1, 2, 3, 4, 5, 6];
- v.drain_filter(|_| true).keep_rest();
- assert_eq!(v, &[0, 1, 2, 3, 4, 5, 6]);
-}
-
-#[test]
-fn test_drain_filter_keep_rest_none() {
- let mut v = vec![0, 1, 2, 3, 4, 5, 6];
- let mut drain = v.drain_filter(|_| true);
-
- drain.by_ref().for_each(drop);
-
- drain.keep_rest();
- assert_eq!(v, &[]);
+ assert_eq!(vec, [1, 2, 3, 4]);
}
#[test]
@@ -1926,6 +1906,7 @@ fn test_stable_pointers() {
assert_eq!(*v0, 13);
// Smoke test that would fire even outside Miri if an actual relocation happened.
+ // Also ensures the pointer is still writeable after all this.
*v0 -= 13;
assert_eq!(v[0], 0);
}
@@ -2414,6 +2395,7 @@ fn test_vec_dedup() {
}
#[test]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn test_vec_dedup_panicking() {
#[derive(Debug)]
struct Panic<'a> {
@@ -2470,6 +2452,7 @@ fn test_vec_dedup_panicking() {
// Regression test for issue #82533
#[test]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn test_extend_from_within_panicking_clone() {
struct Panic<'dc> {
drop_count: &'dc AtomicU32,
diff --git a/library/alloc/tests/vec_deque.rs b/library/alloc/tests/vec_deque.rs
index ddc27e34e..f6fb1f73e 100644
--- a/library/alloc/tests/vec_deque.rs
+++ b/library/alloc/tests/vec_deque.rs
@@ -747,6 +747,7 @@ fn test_drop_clear() {
}
#[test]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn test_drop_panic() {
static mut DROPS: i32 = 0;
@@ -1601,6 +1602,7 @@ fn test_try_rfold_moves_iter() {
}
#[test]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn truncate_leak() {
static mut DROPS: i32 = 0;
@@ -1634,6 +1636,7 @@ fn truncate_leak() {
}
#[test]
+#[cfg_attr(not(panic = "unwind"), ignore = "test requires unwinding support")]
fn test_drain_leak() {
static mut DROPS: i32 = 0;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 15:22:01 +0000