Skip to content

Commit a4a9eb4

Browse files
authored
Merge pull request #4588 from RalfJung/rustup
rustup
2 parents 49757dd + 45d800c commit a4a9eb4

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a015919e54c60b1b2bec7a98dec478cfc4a48f4e
1+
9d82de19dfae60e55c291f5f28e28cfc2c1b9630

tests/pass/shims/fs.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ fn main() {
2828
test_from_raw_os_error();
2929
test_file_clone();
3030
// Windows file handling is very incomplete.
31-
if cfg!(not(windows)) {
31+
// FIXME: read_dir broken on FreeBSD (https://github.com/rust-lang/miri/issues/4587)
32+
if cfg!(not(windows)) && !cfg!(target_os = "freebsd") {
3233
test_file_set_len();
3334
test_file_sync();
3435
test_rename();

0 commit comments

Comments
 (0)