Auto merge of rust-lang#100385 - RalfJung:miri, r=RalfJung

update Miri Fixes rust-lang#100361 r? `@ghost`
rust-lang-ci · Aug 10, 2022 · 29e4a9e · 29e4a9e
2 parents 7bc32fa + 3ba055f
commit 29e4a9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
@@ -417,6 +417,7 @@ dependencies = [
 name = "cargo-miri"
 version = "0.1.0"
 dependencies = [
+ "cargo_metadata 0.15.0",
  "directories",
  "rustc-workspace-hack",
  "rustc_version",

diff --git a/src/tools/miri b/src/tools/miri
+1 −1		.github/workflows/ci.yml
+2 −3		README.md
+55 −20		cargo-miri/Cargo.lock
+2 −1		cargo-miri/Cargo.toml
+0 −1,247		cargo-miri/bin.rs
+134 −0		cargo-miri/src/arg.rs
+98 −0		cargo-miri/src/main.rs
+601 −0		cargo-miri/src/phases.rs
+245 −0		cargo-miri/src/setup.rs
+314 −0		cargo-miri/src/util.rs
+0 −0		cargo-miri/src/version.rs
+3 −3		ci.sh
+4 −2		miri
+1 −1		rust-version
+48 −28		src/bin/miri.rs
+120 −74		src/concurrency/data_race.rs
+15 −10		src/eval.rs
+58 −23		src/helpers.rs
+4 −1		src/lib.rs
+4 −5		src/machine.rs
+10 −9		src/shims/env.rs
+28 −10		src/shims/foreign_items.rs
+12 −64		src/shims/intrinsics/atomic.rs
+25 −16		src/shims/intrinsics/mod.rs
+15 −4		src/shims/intrinsics/simd.rs
+19 −4		src/shims/os_str.rs
+5 −1		src/shims/time.rs
+75 −14		src/shims/unix/foreign_items.rs
+258 −142		src/shims/unix/fs.rs
+2 −2		src/shims/unix/linux/sync.rs
+33 −0		src/shims/unix/macos/foreign_items.rs
+3 −0		src/shims/unix/mod.rs
+1 −0		src/shims/windows/foreign_items.rs
+6 −6		src/stacked_borrows/mod.rs
+4 −3		src/sync.rs
+1 −1		test-cargo-miri/run-test.py
+11 −0		tests/fail/concurrency/read_only_atomic_cmpxchg.rs
+21 −0		tests/fail/concurrency/read_only_atomic_cmpxchg.stderr
+13 −0		tests/fail/concurrency/read_only_atomic_load.rs
+21 −0		tests/fail/concurrency/read_only_atomic_load.stderr
+1 −1		tests/fail/fs/close_stdout.rs
+2 −2		tests/fail/fs/close_stdout.stderr
+13 −0		tests/fail/fs/mkstemp_immutable_arg.rs
+20 −0		tests/fail/fs/mkstemp_immutable_arg.stderr
+0 −2		tests/fail/intrinsics/ptr_offset_from_unsigned_neg.rs
+2 −2		tests/fail/intrinsics/ptr_offset_from_unsigned_neg.stderr
+19 −0		tests/fail/issue-miri-2432.rs
+15 −0		tests/fail/issue-miri-2432.stderr
+0 −0		tests/panic/div-by-zero-2.rs
+0 −0		tests/panic/div-by-zero-2.stderr
+0 −0		tests/panic/overflowing-lsh-neg.rs
+0 −0		tests/panic/overflowing-lsh-neg.stderr
+0 −0		tests/panic/overflowing-rsh-1.rs
+0 −0		tests/panic/overflowing-rsh-1.stderr
+0 −0		tests/panic/overflowing-rsh-2.rs
+0 −0		tests/panic/overflowing-rsh-2.stderr
+0 −0		tests/panic/panic1.rs
+0 −0		tests/panic/panic1.stderr
+0 −0		tests/panic/panic2.rs
+0 −0		tests/panic/panic2.stderr
+0 −0		tests/panic/panic3.rs
+0 −0		tests/panic/panic3.stderr
+0 −0		tests/panic/panic4.rs
+0 −0		tests/panic/panic4.stderr
+0 −0		tests/panic/unsupported_foreign_function.rs
+0 −0		tests/panic/unsupported_foreign_function.stderr
+0 −0		tests/panic/unsupported_syscall.rs
+0 −0		tests/panic/unsupported_syscall.stderr
+1 −2		tests/pass/backtrace/backtrace-global-alloc.rs
+1 −2		tests/pass/backtrace/backtrace-std.rs
+3 −3		tests/pass/concurrency/linux-futex.rs
+0 −0		tests/pass/env/args.rs
+0 −0		tests/pass/env/args.stdout
+0 −0		tests/pass/env/current_dir.rs
+0 −0		tests/pass/env/current_dir_with_isolation.rs
+0 −0		tests/pass/env/current_dir_with_isolation.stderr
+9 −0		tests/pass/env/current_exe.rs
+9 −0		tests/pass/env/home.rs
+0 −0		tests/pass/env/var-exclude.rs
+0 −0		tests/pass/env/var-forward.rs
+0 −0		tests/pass/env/var-without-isolation.rs
+0 −0		tests/pass/env/var.rs
+0 −0		tests/pass/env/var.stdout
+29 −0		tests/pass/fs.rs
+8 −6		tests/pass/integer-ops.rs
+54 −23		tests/pass/intrinsics-math.rs
+130 −4		tests/pass/libc.rs
+10 −0		tests/pass/portable-simd.rs
+18 −0		tests/pass/sleep_long.rs
+8 −3		ui_test/src/lib.rs