Skip to content

Commit 6f341f4

Browse files
authored
Merge pull request #51 from RalfJung/rustup
rustup
2 parents 7afab9c + da29824 commit 6f341f4

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

rust-src.diff

-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +0,0 @@
1-
diff --git a/library/std/src/io/tests.rs b/library/std/src/io/tests.rs
2-
index c306de3039f..eb5d5988768 100644
3-
--- a/library/std/src/io/tests.rs
4-
+++ b/library/std/src/io/tests.rs
5-
@@ -694,6 +694,8 @@ fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
6-
}
7-
8-
#[test]
9-
+// Miri does not support signalling OOM
10-
+#[cfg_attr(miri, ignore)]
11-
// 64-bit only to be sure the allocator will fail fast on an impossible to satsify size
12-
#[cfg(target_pointer_width = "64")]
13-
fn try_oom_error() {

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2024-03-11
1+
nightly-2024-03-12

0 commit comments

Comments
 (0)