Skip to content

Conversation

@RalfJung
Copy link
Member

@RalfJung RalfJung commented Jun 1, 2025

r? @ghost

Includes rust-lang/miri#4370 to unbreak PR CI. (So we're committing to having 0b89724e1 in the Miri history by landing this, whether or not that Miri PR lands.)

Cc @Noratrieb @tiif

CraftSpider and others added 30 commits May 22, 2025 11:59
./miri bench: sort results alphabetically
test some aarch64 windows targets
Support F_GETFL and F_SETFL for fcntl
RalfJung and others added 25 commits May 29, 2025 11:51
Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <[email protected]>

allow multiple seeds

use bitsets

fix xcompile

listened to reason and made my life so much easier

fmt

Update src/machine.rs

Co-authored-by: Ralf Jung <[email protected]>

fixups

avoid some clones

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <[email protected]>

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <[email protected]>

address review

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <[email protected]>

fixup comment

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <[email protected]>

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <[email protected]>

address review pt 2

nit

rem fn

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <[email protected]>

Update src/alloc/isolated_alloc.rs

Co-authored-by: Ralf Jung <[email protected]>

address review

unneeded unsafe
Isolate MiriMachine memory from Miri's
Change unsupported diagnostic wording
Co-authored-by: Ralf Jung <[email protected]>
Co-authored-by: Johannes Hostert <[email protected]>
cargo-miri: recognize --verbose alongside -v
The test did `write` and `read` and hoped that it would read/write
everything, which doesn't always happen and caused CI failures.
Switch to `write_all` and `read_to_end` to make it more reliable.
…-a-lot-instead

Fix tokio/file-io.rs test relying on `read`/`write` not being short
Tokio `AsyncWriteExt::write` doesn't actually ensure that the contents
have written, it just *starts* the write operation. To ensure that the
file has actually been written, we need to `sync_all` first.
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 1, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 1, 2025

The Miri subtree was changed

cc @rust-lang/miri

@RalfJung RalfJung closed this Jun 1, 2025
@RalfJung RalfJung deleted the miri-sync branch June 1, 2025 14:35
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
tests/pass/shims/fs-symlink.rs ... ok
tests/pass/tree_borrows/copy-nonoverlapping.rs ... ok
tests/pass/tree_borrows/cell-alternate-writes.rs ... ok
tests/pass/shims/sleep_long.rs ... ok
tests/pass/tree_borrows/cell-lazy-write-to-surrounding.rs ... ok
tests/pass/shims/time.rs ... ok
tests/pass/backtrace/backtrace-api-v1.rs ... ok
tests/pass/shims/aarch64/intrinsics-aarch64-neon.rs ... ignored (in-test comment)
tests/pass/tree_borrows/end-of-protector.rs ... ok
tests/pass/async-drop.rs ... ok
---
tests/pass-dep/concurrency/linux-futex.rs ... ok
tests/pass-dep/libc/mmap.rs ... ok

FAILED TEST: tests/pass-dep/tokio/file-io.rs
command: MIRI_ENV_VAR_TEST="0" MIRI_TEMP="/tmp/miri-uitest-4yum1V" RUST_BACKTRACE="1" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/miri" "--error-format=json" "--sysroot=/checkout/obj/build/x86_64-unknown-linux-gnu/miri-sysroot" "-Dwarnings" "-Dunused" "-Ainternal_features" "-Zui-testing" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/tests/pass-dep/tokio" "tests/pass-dep/tokio/file-io.rs" "-Zmiri-disable-isolation" "--extern" "cfg_if=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libcfg_if-55a32e410325a882.rlib" "--extern" "cfg_if=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libcfg_if-55a32e410325a882.rmeta" "--extern" "getrandom_01=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libgetrandom-77190f9b44a3c009.rlib" "--extern" "getrandom_01=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libgetrandom-77190f9b44a3c009.rmeta" "--extern" "getrandom_02=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libgetrandom-56888fca95a09bf8.rlib" "--extern" "getrandom_02=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libgetrandom-56888fca95a09bf8.rmeta" "--extern" "getrandom_03=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libgetrandom-a8fc577bb44b6d80.rlib" "--extern" "getrandom_03=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libgetrandom-a8fc577bb44b6d80.rmeta" "--extern" "libc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/liblibc-dd98cac8117d550a.rlib" "--extern" "libc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/liblibc-dd98cac8117d550a.rmeta" "--extern" "num_cpus=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libnum_cpus-7ab8becb6da559b7.rlib" "--extern" "num_cpus=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libnum_cpus-7ab8becb6da559b7.rmeta" "--extern" "page_size=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libpage_size-c34469ad90c5eb76.rlib" "--extern" "page_size=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libpage_size-c34469ad90c5eb76.rmeta" "--extern" "tempfile=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libtempfile-d40c54a83e8abae9.rlib" "--extern" "tempfile=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libtempfile-d40c54a83e8abae9.rmeta" "--extern" "tokio=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libtokio-539f2d149eae570a.rlib" "--extern" "tokio=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps/libtokio-539f2d149eae570a.rmeta" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/debug/deps" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/miri/x86_64-unknown-linux-gnu/debug/deps" "--edition" "2021"

error: test got exit status: 1, but expected 0
 = note: compilation failed, but was expected to succeed

error: no output was expected
Execute `./miri test --bless` to update `tests/pass-dep/tokio/file-io.stderr` to the actual output
+++ <stderr output>
error[E0599]: no method named `flish` found for struct `tokio::fs::File` in the current scope
##[error]  --> tests/pass-dep/tokio/file-io.rs:26:10
   |
LL |     file.flish().await?;
   |          ^^^^^
   |
help: there is a method `flush` with a similar name
   |
LL -     file.flish().await?;
LL +     file.flush().await?;
   |

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0599`.


full stderr:
error[E0599]: no method named `flish` found for struct `tokio::fs::File` in the current scope
##[error]  --> tests/pass-dep/tokio/file-io.rs:26:10
   |
LL |     file.flish().await?;
   |          ^^^^^
   |
help: there is a method `flush` with a similar name
   |
LL -     file.flish().await?;
LL +     file.flush().await?;
   |

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0599`.
---

Location:
   /cargo/registry/src/index.crates.io-1949cf8c6b5b557f/ui_test-0.29.2/src/lib.rs:369

Backtrace omitted. Run with RUST_BACKTRACE=1 environment variable to display it.
Run with RUST_BACKTRACE=full to include source snippets.
error: test failed, to rerun pass `--test ui`

Caused by:
  process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-linux-gnu/release/deps/ui-f58affc77002becb` (exit status: 1)
Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 0:05:04
  local time: Sun Jun  1 15:13:48 UTC 2025
  network time: Sun, 01 Jun 2025 15:13:48 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants