Skip to content

Commit 8231456

Browse files
Rollup merge of #152487 - joboet:array_map_zst, r=oli-obk
core: drop unmapped ZSTs in array `map` Fixes rust-lang/rust#152211. Alternative to rust-lang/rust#152220 and rust-lang/rust#152248. This makes the `Drain` type use the same ZST-handling strategy as `slice::IterMut`, which stores the remaining length instead of a one-past-the-end pointer when the type is a ZST. I've also removed the const-generic `N` parameter from `Drain` to avoid unnecessary monomorphizations.
2 parents 87b8765 + aaf0090 commit 8231456

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

patches/0027-sysroot_tests-128bit-atomic-operations.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ index 1e336bf..35e6f54 100644
1616
+++ b/coretests/tests/lib.rs
1717
@@ -2,4 +2,3 @@
1818
// tidy-alphabetical-start
19+
#![cfg_attr(not(panic = "abort"), feature(reentrant_lock))]
1920
-#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))]
2021
#![feature(array_ptr_get)]
2122
#![feature(array_try_from_fn)]
@@ -36,4 +37,3 @@ index b735957..ea728b6 100644
3637
#[cfg(target_has_atomic = "ptr")]
3738
--
3839
2.26.2.7.g19db9cfb68
39-

0 commit comments

Comments
 (0)