Skip to content

Commit

Permalink
Rollup merge of rust-lang#97621 - RalfJung:miri, r=RalfJung
Browse files Browse the repository at this point in the history
update Miri

Fixes rust-lang#97563
Cc ``@rust-lang/miri`` r? ``@ghost``
  • Loading branch information
matthiaskrgr committed Jun 1, 2022
2 parents 1730b62 + 9f2b69d commit 89e765f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5509,6 +5509,8 @@ dependencies = [
"pretty_assertions 1.2.1",
"regex",
"rustc_version",
"serde",
"serde_json",
]

[[package]]
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Submodule miri updated 84 files
+4 −2 .github/workflows/ci.yml
+45 −0 Cargo.lock
+5 −9 cargo-miri/bin.rs
+2 −0 cargo-miri/version.rs
+1 −2 ci.sh
+1 −1 miri
+1 −1 rust-version
+2 −9 src/bin/miri.rs
+3 −3 src/helpers.rs
+18 −4 src/shims/time.rs
+38 −20 src/stacked_borrows.rs
+1 −1 test-cargo-miri/tests/test.rs
+5 −1 tests/compile-fail/alloc/deallocate-bad-alignment.stderr
+5 −1 tests/compile-fail/alloc/deallocate-bad-size.stderr
+5 −1 tests/compile-fail/alloc/deallocate-twice.stderr
+2 −0 tests/compile-fail/alloc/global_system_mixup.rs
+7 −3 tests/compile-fail/alloc/global_system_mixup.stderr
+5 −1 tests/compile-fail/alloc/reallocate-bad-size.stderr
+5 −1 tests/compile-fail/alloc/reallocate-dangling.stderr
+9 −5 tests/compile-fail/alloc/stack_free.stderr
+1 −1 tests/compile-fail/concurrency/too_few_args.stderr
+1 −1 tests/compile-fail/concurrency/too_many_args.stderr
+1 −1 tests/compile-fail/dangling_pointers/dangling_pointer_addr_of.stderr
+6 −2 tests/compile-fail/dangling_pointers/null_pointer_write_zst.stderr
+11 −7 tests/compile-fail/fs/isolated_file.stderr
+1 −0 tests/compile-fail/generator-pinned-moved.rs
+2 −2 tests/compile-fail/generator-pinned-moved.stderr
+1 −1 tests/compile-fail/intrinsics/assume.rs
+6 −2 tests/compile-fail/intrinsics/copy_overflow.stderr
+5 −1 tests/compile-fail/intrinsics/out_of_bounds_ptr_1.stderr
+5 −1 tests/compile-fail/intrinsics/out_of_bounds_ptr_2.stderr
+5 −1 tests/compile-fail/intrinsics/out_of_bounds_ptr_3.stderr
+5 −1 tests/compile-fail/intrinsics/ptr_offset_0_plus_0.stderr
+5 −1 tests/compile-fail/intrinsics/ptr_offset_int_plus_int.stderr
+5 −1 tests/compile-fail/intrinsics/ptr_offset_int_plus_ptr.stderr
+5 −1 tests/compile-fail/intrinsics/ptr_offset_overflow.stderr
+5 −1 tests/compile-fail/intrinsics/ptr_offset_ptr_plus_0.stderr
+5 −1 tests/compile-fail/intrinsics/simd-float-to-int.stderr
+5 −1 tests/compile-fail/intrinsics/simd-gather.stderr
+5 −1 tests/compile-fail/intrinsics/simd-scatter.stderr
+6 −2 tests/compile-fail/intrinsics/write_bytes_overflow.stderr
+5 −1 tests/compile-fail/invalid_enum_tag.stderr
+2 −0 tests/compile-fail/no_main.stderr
+3 −3 tests/compile-fail/panic/bad_unwind.stderr
+2 −0 tests/compile-fail/panic/double_panic.rs
+41 −37 tests/compile-fail/panic/double_panic.stderr
+2 −0 tests/compile-fail/panic/panic_abort1.rs
+13 −9 tests/compile-fail/panic/panic_abort1.stderr
+2 −0 tests/compile-fail/panic/panic_abort2.rs
+14 −10 tests/compile-fail/panic/panic_abort2.stderr
+2 −0 tests/compile-fail/panic/panic_abort3.rs
+15 −11 tests/compile-fail/panic/panic_abort3.stderr
+2 −0 tests/compile-fail/panic/panic_abort4.rs
+14 −10 tests/compile-fail/panic/panic_abort4.stderr
+5 −1 tests/compile-fail/provenance/strict-provenance-offset.stderr
+1 −1 tests/compile-fail/rc_as_ptr.stderr
+10 −6 tests/compile-fail/stacked_borrows/deallocate_against_barrier1.stderr
+10 −6 tests/compile-fail/stacked_borrows/deallocate_against_barrier2.stderr
+6 −2 tests/compile-fail/stacked_borrows/issue-miri-1050-1.stderr
+6 −2 tests/compile-fail/stacked_borrows/issue-miri-1050-2.stderr
+13 −2 tests/compile-fail/stacked_borrows/zst_slice.stderr
+1 −1 tests/compile-fail/sync/libc_pthread_cond_double_destroy.rs
+1 −1 tests/compile-fail/sync/libc_pthread_condattr_double_destroy.rs
+1 −1 tests/compile-fail/sync/libc_pthread_mutex_double_destroy.rs
+1 −1 tests/compile-fail/sync/libc_pthread_mutexattr_double_destroy.rs
+1 −1 tests/compile-fail/sync/libc_pthread_rwlock_double_destroy.rs
+1 −1 tests/compile-fail/unaligned_pointers/unaligned_ptr_addr_of.stderr
+6 −2 tests/compile-fail/uninit_buffer.stderr
+5 −1 tests/compile-fail/unreachable.stderr
+6 −5 tests/compiletest.rs
+13 −13 tests/run-fail/panic/panic1.stderr
+1 −14 tests/run-pass/backtrace-api-v0.stderr
+1 −14 tests/run-pass/backtrace-api-v1.stderr
+13 −13 tests/run-pass/backtrace-std.stderr
+25 −0 tests/run-pass/libc.rs
+1 −1 tests/run-pass/panic/catch_panic.stderr
+45 −0 ui_test/Cargo.lock
+2 −0 ui_test/Cargo.toml
+3 −3 ui_test/README.md
+34 −2 ui_test/src/comments.rs
+1 −1 ui_test/src/comments/tests.rs
+206 −55 ui_test/src/lib.rs
+152 −0 ui_test/src/rustc_stderr.rs
+291 −18 ui_test/src/tests.rs

0 comments on commit 89e765f

Please sign in to comment.