Skip to content

Commit a2797e5

Browse files
authored
Rollup merge of rust-lang#138082 - thaliaarchi:slice-cfg-not-test, r=thomcc
Remove `#[cfg(not(test))]` gates in `core` These gates are unnecessary now that unit tests for `core` are in a separate package, `coretests`, instead of in the same files as the source code. They previously prevented the two `core` versions from conflicting with each other.
2 parents 025eecc + fd3fb2c commit a2797e5

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

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

+11-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ad7ffe71baba46865f2e65266ab025920dfdc20b Mon Sep 17 00:00:00 2001
1+
From 5d7c709608b01301d4628d2159265936d4440b67 Mon Sep 17 00:00:00 2001
22
From: bjorn3 <[email protected]>
33
Date: Thu, 18 Feb 2021 18:45:28 +0100
44
Subject: [PATCH] Disable 128bit atomic operations
@@ -7,11 +7,10 @@ Cranelift doesn't support them yet
77
---
88
library/core/src/panic/unwind_safe.rs | 6 -----
99
library/core/src/sync/atomic.rs | 38 ---------------------------
10-
library/core/tests/atomic.rs | 4 ---
11-
4 files changed, 4 insertions(+), 50 deletions(-)
10+
2 files changed, 44 deletions(-)
1211

1312
diff --git a/library/core/src/panic/unwind_safe.rs b/library/core/src/panic/unwind_safe.rs
14-
index 092b7cf..158cf71 100644
13+
index a60f0799c0e..af056fbf41f 100644
1514
--- a/library/core/src/panic/unwind_safe.rs
1615
+++ b/library/core/src/panic/unwind_safe.rs
1716
@@ -216,9 +216,6 @@ impl RefUnwindSafe for crate::sync::atomic::AtomicI32 {}
@@ -21,7 +20,7 @@ index 092b7cf..158cf71 100644
2120
-#[cfg(target_has_atomic_load_store = "128")]
2221
-#[unstable(feature = "integer_atomics", issue = "99069")]
2322
-impl RefUnwindSafe for crate::sync::atomic::AtomicI128 {}
24-
23+
2524
#[cfg(target_has_atomic_load_store = "ptr")]
2625
#[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
2726
@@ -235,9 +232,6 @@ impl RefUnwindSafe for crate::sync::atomic::AtomicU32 {}
@@ -31,14 +30,14 @@ index 092b7cf..158cf71 100644
3130
-#[cfg(target_has_atomic_load_store = "128")]
3231
-#[unstable(feature = "integer_atomics", issue = "99069")]
3332
-impl RefUnwindSafe for crate::sync::atomic::AtomicU128 {}
34-
33+
3534
#[cfg(target_has_atomic_load_store = "8")]
3635
#[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
3736
diff --git a/library/core/src/sync/atomic.rs b/library/core/src/sync/atomic.rs
38-
index d9de37e..8293fce 100644
37+
index bf2b6d59f88..d5ccce03bbf 100644
3938
--- a/library/core/src/sync/atomic.rs
4039
+++ b/library/core/src/sync/atomic.rs
41-
@@ -2996,44 +2996,6 @@ atomic_int! {
40+
@@ -3585,44 +3585,6 @@ pub const fn as_ptr(&self) -> *mut $int_type {
4241
8,
4342
u64 AtomicU64
4443
}
@@ -54,7 +53,7 @@ index d9de37e..8293fce 100644
5453
- unstable(feature = "integer_atomics", issue = "99069"),
5554
- rustc_const_unstable(feature = "integer_atomics", issue = "99069"),
5655
- rustc_const_unstable(feature = "integer_atomics", issue = "99069"),
57-
- cfg_attr(not(test), rustc_diagnostic_item = "AtomicI128"),
56+
- rustc_diagnostic_item = "AtomicI128",
5857
- "i128",
5958
- "#![feature(integer_atomics)]\n\n",
6059
- atomic_min, atomic_max,
@@ -73,7 +72,7 @@ index d9de37e..8293fce 100644
7372
- unstable(feature = "integer_atomics", issue = "99069"),
7473
- rustc_const_unstable(feature = "integer_atomics", issue = "99069"),
7574
- rustc_const_unstable(feature = "integer_atomics", issue = "99069"),
76-
- cfg_attr(not(test), rustc_diagnostic_item = "AtomicU128"),
75+
- rustc_diagnostic_item = "AtomicU128",
7776
- "u128",
7877
- "#![feature(integer_atomics)]\n\n",
7978
- atomic_umin, atomic_umax,
@@ -83,7 +82,6 @@ index d9de37e..8293fce 100644
8382

8483
#[cfg(target_has_atomic_load_store = "ptr")]
8584
macro_rules! atomic_int_ptr_sized {
86-
( $($target_pointer_width:literal $align:literal)* ) => { $(
87-
--
88-
2.26.2.7.g19db9cfb68
85+
--
86+
2.48.1
8987

0 commit comments

Comments
 (0)