Skip to content

Commit 48ad3c3

Browse files
authored
Merge pull request #96 from RalfJung/rustup
make tests work now that we cross-run doctests
2 parents ff66b03 + 007f74a commit 48ad3c3

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

ci-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ alloc)
5555
;;
5656
std)
5757
# Modules that we skip because they need a lot of shims we don't support.
58-
SKIP="fs:: net:: process:: sys::pal:: sys::fd::"
58+
SKIP="fs:: net:: process:: sys::fd:: sys::pal::"
5959

6060
# A 64bit little-endian and a 32bit big-endian target,
6161
# as well as targets covering all major OSes and both ABIs on Windows.

rust-src.diff

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/library/std/src/io/mod.rs b/library/std/src/io/mod.rs
2+
index 96fac4f6bde..fbb3ea603ab 100644
3+
--- a/library/std/src/io/mod.rs
4+
+++ b/library/std/src/io/mod.rs
5+
@@ -2335,6 +2335,7 @@ pub trait BufRead: Read {
6+
/// #![feature(buf_read_has_data_left)]
7+
/// use std::io;
8+
/// use std::io::prelude::*;
9+
+ /// # if cfg!(all(miri, windows)) { return Ok(()); } // FIXME(miri-windows-file-access)
10+
///
11+
/// let stdin = io::stdin();
12+
/// let mut stdin = stdin.lock();

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2025-05-01
1+
nightly-2025-05-18

0 commit comments

Comments
 (0)