Skip to content

Commit b19e305

Browse files
committed
Auto merge of #151291 - jhpratt:rollup-CVsL9ZN, r=jhpratt
Rollup of 8 pull requests Successful merges: - rust-lang/rust#148769 (Stabilize `alloc_layout_extra`) - rust-lang/rust#150200 (Add title field to `ice.md` issue template) - rust-lang/rust#150955 (Underscore-prefixed bindings are explicitly allowed to be unused) - rust-lang/rust#151200 (time: Add saturating arithmetic for `SystemTime`) - rust-lang/rust#151235 (Change field `bit_width: usize` to `bits: u32` in type info) - rust-lang/rust#151242 (Port #[needs_allocator] to attribute parser) - rust-lang/rust#151274 (Include a link to `count_ones` in the docs for `uN::count_zeros` [docs only]) - rust-lang/rust#151279 (remove trailing periods in built-in attribute gate messages) r? @ghost
2 parents da52f5d + c4a5538 commit b19e305

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ diff --git a/coretests/tests/lib.rs b/coretests/tests/lib.rs
1414
index 1e336bf..35e6f54 100644
1515
--- a/coretests/tests/lib.rs
1616
+++ b/coretests/tests/lib.rs
17-
@@ -2,5 +2,4 @@
17+
@@ -2,4 +2,3 @@
1818
// tidy-alphabetical-start
1919
-#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))]
2020
#![cfg_attr(test, feature(cfg_select))]
21-
#![feature(alloc_layout_extra)]
2221
#![feature(array_ptr_get)]
2322
diff --git a/coretests/tests/atomic.rs b/coretests/tests/atomic.rs
2423
index b735957..ea728b6 100644

0 commit comments

Comments
 (0)