Skip to content

Commit 12e873a

Browse files
committed
rustup; patch no longer needed
1 parent b4acf60 commit 12e873a

File tree

2 files changed

+1
-37
lines changed

2 files changed

+1
-37
lines changed

rust-src.diff

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +0,0 @@
1-
diff --git a/library/core/tests/atomic.rs b/library/core/tests/atomic.rs
2-
index b735957666f..539982eb0e4 100644
3-
--- a/library/core/tests/atomic.rs
4-
+++ b/library/core/tests/atomic.rs
5-
@@ -61,6 +61,7 @@ fn uint_xor() {
6-
7-
#[test]
8-
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
9-
+#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_min
10-
fn uint_min() {
11-
let x = AtomicUsize::new(0xf731);
12-
assert_eq!(x.fetch_min(0x137f, SeqCst), 0xf731);
13-
@@ -71,6 +72,7 @@ fn uint_min() {
14-
15-
#[test]
16-
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
17-
+#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_max
18-
fn uint_max() {
19-
let x = AtomicUsize::new(0x137f);
20-
assert_eq!(x.fetch_max(0xf731, SeqCst), 0x137f);
21-
@@ -109,6 +111,7 @@ fn int_xor() {
22-
23-
#[test]
24-
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
25-
+#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_min
26-
fn int_min() {
27-
let x = AtomicIsize::new(0xf731);
28-
assert_eq!(x.fetch_min(0x137f, SeqCst), 0xf731);
29-
@@ -119,6 +122,7 @@ fn int_min() {
30-
31-
#[test]
32-
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
33-
+#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_max
34-
fn int_max() {
35-
let x = AtomicIsize::new(0x137f);
36-
assert_eq!(x.fetch_max(0xf731, SeqCst), 0x137f);

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2021-02-23
1+
nightly-2021-02-24

0 commit comments

Comments
 (0)