Skip to content

bump Miri #69344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 3 commits into from
Feb 24, 2020
Merged

bump Miri #69344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
821c440
bump Miri
RalfJung Feb 21, 2020
1a0e200
fix miri and bootstrap interaction
RalfJung Feb 21, 2020
ffa1aa6
bump Miri once more
RalfJung Feb 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/bootstrap/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,8 @@ impl Step for Miri {
cargo.env("XARGO_RUST_SRC", builder.src.join("src"));
// Debug things.
cargo.env("RUST_BACKTRACE", "1");
// Overwrite bootstrap's `rustc` wrapper overwriting our flags.
cargo.env("RUSTC_DEBUG_ASSERTIONS", "true");
// Let cargo-miri know where xargo ended up.
cargo.env("XARGO", builder.out.join("bin").join("xargo"));

Expand All @@ -397,7 +399,7 @@ impl Step for Miri {
}

// # Determine where Miri put its sysroot.
// To this end, we run `cargo miri setup --env` and capture the output.
// To this end, we run `cargo miri setup --print-sysroot` and capture the output.
// (We do this separately from the above so that when the setup actually
// happens we get some output.)
// We re-use the `cargo` from above.
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Open in desktop
Submodule miri updated 27 files
+159 −214 Cargo.lock
+10 −11 README.md
+1 −1 rust-version
+0 −2 src/bin/cargo-miri.rs
+1 −1 src/eval.rs
+17 −5 src/helpers.rs
+2 −1 src/lib.rs
+33 −608 src/shims/foreign_items.rs
+335 −0 src/shims/foreign_items/posix.rs
+106 −0 src/shims/foreign_items/posix/linux.rs
+91 −0 src/shims/foreign_items/posix/macos.rs
+212 −0 src/shims/foreign_items/windows.rs
+217 −138 src/shims/fs.rs
+25 −25 test-cargo-miri/Cargo.lock
+1 −1 test-cargo-miri/tests/test.rs
+7 −1 tests/compile-fail/copy_null.rs
+7 −3 tests/compile-fail/copy_overlapping.rs
+7 −1 tests/compile-fail/copy_unaligned.rs
+0 −3 tests/run-pass/coerce_non_capture_closure_to_fn_ptr.rs
+113 −21 tests/run-pass/fs.rs
+7 −2 tests/run-pass/panic/catch_panic.rs
+6 −0 tests/run-pass/panic/catch_panic.stderr
+1 −1 tests/run-pass/panic/div-by-zero-2.rs
+1 −2 tests/run-pass/panic/overflowing-lsh-neg.rs
+1 −1 tests/run-pass/panic/overflowing-lsh-neg.stderr
+1 −1 tests/run-pass/panic/overflowing-rsh-1.rs
+1 −1 tests/run-pass/panic/overflowing-rsh-2.rs