Skip to content

Commit

Permalink
Auto merge of rust-lang#58879 - spastorino:update_miri, r=oli-obk
Browse files Browse the repository at this point in the history 
Update miri

Related to rust-lang#58841

r? @RalfJung
  • Loading branch information
@bors
bors committed Mar 3, 2019
2 parents f565cdd + ddd4731 commit c0086b9
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
22 changes: 22 additions & 0 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ dependencies = [
"serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"tester 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]

Expand Down Expand Up @@ -3437,6 +3438,15 @@ dependencies = [
name = "term"
version = "0.0.0"

[[package]]
name = "term"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "term"
version = "0.5.1"
Expand Down Expand Up @@ -3473,6 +3483,16 @@ dependencies = [
"term 0.0.0",
]

[[package]]
name = "tester"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
"term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "textwrap"
version = "0.10.0"
Expand Down Expand Up @@ -4234,9 +4254,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum tar 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "a303ba60a099fcd2aaa646b14d2724591a96a75283e4b7ed3d1a1658909d9ae2"
"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2"
"checksum tendril 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9de21546595a0873061940d994bbbc5c35f024ae4fd61ec5c5b159115684f508"
"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
"checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561"
"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
"checksum tester 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e812cb26c597f86a49b26dbb58b878bd2a2b4b93fc069dc39499228fe556ff6"
"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
"checksum time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Submodule miri updated 97 files
+1 −1 Cargo.toml
+1 −1 README.md
+1 −1 rust-version
+55 −50 src/bin/cargo-miri.rs
+23 −25 src/bin/miri.rs
+104 −78 src/fn_call.rs
+13 −12 src/helpers.rs
+16 −9 src/intrinsic.rs
+78 −75 src/lib.rs
+4 −4 src/mono_hash_map.rs
+43 −28 src/operator.rs
+37 −33 src/range_map.rs
+115 −96 src/stacked_borrows.rs
+1 −1 src/tls.rs
+0 −10 tests/compile-fail/copy_nonoverlapping.rs
+1 −11 tests/compile-fail/copy_null.rs
+0 −10 tests/compile-fail/copy_unaligned.rs
+0 −10 tests/compile-fail/div-by-zero-1.rs
+0 −10 tests/compile-fail/div-by-zero-2.rs
+0 −10 tests/compile-fail/overflowing-lsh-neg.rs
+0 −10 tests/compile-fail/overflowing-rsh-1.rs
+0 −10 tests/compile-fail/overflowing-rsh-2.rs
+0 −10 tests/compile-fail/overflowing-unchecked-rsh.rs
+1 −1 tests/compile-fail/ptr_offset_ptr_plus_0.rs
+1 −1 tests/compile-fail/reading_half_a_pointer.rs
+1 −1 tests/compile-fail/stacked_borrows/deallocate_against_barrier.rs
+1 −1 tests/compile-fail/stacked_borrows/illegal_read1.rs
+1 −1 tests/compile-fail/stacked_borrows/illegal_read2.rs
+9 −7 tests/compile-fail/stacked_borrows/illegal_read3.rs
+1 −1 tests/compile-fail/stacked_borrows/illegal_read5.rs
+5 −4 tests/compile-fail/stacked_borrows/illegal_write5.rs
+4 −2 tests/compile-fail/transmute-pair-undef.rs
+5 −4 tests/compile-fail/unaligned_ptr_cast2.rs
+3 −2 tests/compile-fail/unaligned_ptr_cast_zst.rs
+3 −2 tests/compile-fail/validity/cast_fn_ptr1.rs
+3 −2 tests/compile-fail/validity/cast_fn_ptr2.rs
+2 −2 tests/compiletest.rs
+0 −10 tests/run-pass/associated-const.rs
+0 −10 tests/run-pass/atomic-access-bool.rs
+0 −10 tests/run-pass/atomic-compare_exchange.rs
+0 −10 tests/run-pass/binops.rs
+0 −10 tests/run-pass/cast-rfc0401-vtable-kinds.rs
+0 −10 tests/run-pass/const-vec-of-fns.rs
+0 −10 tests/run-pass/deriving-associated-types.rs
+0 −10 tests/run-pass/dst-field-align.rs
+0 −10 tests/run-pass/dst-irrefutable-bind.rs
+0 −10 tests/run-pass/dst-raw.rs
+0 −10 tests/run-pass/dst-struct-sole.rs
+0 −10 tests/run-pass/dst-struct.rs
+0 −10 tests/run-pass/enum-nullable-const-null-with-fields.rs
+0 −10 tests/run-pass/float_fast_math.rs
+0 −10 tests/run-pass/foreign-fn-linkname.rs
+0 −10 tests/run-pass/generator.rs
+57 −0 tests/run-pass/heap_allocator.rs
+0 −29 tests/run-pass/heap_system.rs
+0 −10 tests/run-pass/issue-15063.rs
+0 −10 tests/run-pass/issue-15080.rs
+0 −10 tests/run-pass/issue-15523-big.rs
+0 −10 tests/run-pass/issue-17877.rs
+0 −10 tests/run-pass/issue-20575.rs
+0 −10 tests/run-pass/issue-23261.rs
+0 −10 tests/run-pass/issue-26709.rs
+0 −10 tests/run-pass/issue-27901.rs
+0 −10 tests/run-pass/issue-29746.rs
+0 −10 tests/run-pass/issue-31267-additional.rs
+0 −10 tests/run-pass/issue-33387.rs
+0 −10 tests/run-pass/issue-34571.rs
+0 −10 tests/run-pass/issue-35815.rs
+0 −10 tests/run-pass/issue-36278-prefix-nesting.rs
+0 −10 tests/run-pass/issue-3794.rs
+0 −10 tests/run-pass/issue-5917.rs
+0 −10 tests/run-pass/last-use-in-cap-clause.rs
+0 −10 tests/run-pass/loop-break-value.rs
+0 −10 tests/run-pass/mir_coercions.rs
+0 −10 tests/run-pass/mir_fat_ptr.rs
+0 −10 tests/run-pass/move-arg-2-unique.rs
+0 −10 tests/run-pass/move-arg-3-unique.rs
+0 −10 tests/run-pass/overloaded-calls-simple.rs
+3 −3 tests/run-pass/ref-invalid-ptr.rs
+2 −12 tests/run-pass/regions-lifetime-nonfree-late-bound.rs
+0 −10 tests/run-pass/regions-mock-trans.rs
+0 −10 tests/run-pass/rfc1623.rs
+0 −10 tests/run-pass/send-is-not-static-par-for.rs
+0 −10 tests/run-pass/sendable-class.rs
+0 −10 tests/run-pass/simd-intrinsic-generic-elements.rs
+3 −3 tests/run-pass/stacked-borrows.rs
+1 −1 tests/run-pass/too-large-primval-write-problem.rs
+0 −10 tests/run-pass/try-operator-custom.rs
+0 −10 tests/run-pass/u128.rs
+0 −10 tests/run-pass/union-overwrite.rs
+0 −10 tests/run-pass/unique-send.rs
+0 −10 tests/run-pass/unsized-tuple-impls.rs
+2 −2 tests/run-pass/validation_lifetime_resolution.rs
+0 −10 tests/run-pass/vec-matching-fold.rs
+12 −0 tests/run-pass/volatile.rs
+0 −10 tests/run-pass/zero-sized-binary-heap-push.rs
+3 −3 tests/run-pass/zst.rs

0 comments on commit c0086b9

Please sign in to comment.