Skip to content
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

update miri #58535

Merged
merged 3 commits into from
Feb 21, 2019
+4 −3
Merged

update miri #58535

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
5cf0d7b
update miri
RalfJung Feb 17, 2019
7596a10
update Cargo.lock and miri URL
RalfJung Feb 17, 2019
7f5d50e
update miri
RalfJung Feb 17, 2019
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: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
url = https://github.com/rust-lang-nursery/rustfmt.git
[submodule "src/tools/miri"]
path = src/tools/miri
url = https://github.com/solson/miri.git
url = https://github.com/rust-lang/miri.git
[submodule "src/doc/rust-by-example"]
path = src/doc/rust-by-example
url = https://github.com/rust-lang/rust-by-example.git
Expand All @@ -46,4 +46,4 @@
branch = rustc/8.0-2019-01-16
[submodule "src/doc/embedded-book"]
path = src/doc/embedded-book
url = https://github.com/rust-embedded/book.git
url = https://github.com/rust-embedded/book.git
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,6 +1626,7 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-workspace-hack 1.0.0",
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"shell-escape 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"vergen 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
]

Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Open in desktop
Submodule miri updated 65 files
+0 −0 .appveyor.yml
+3 −0 .travis.yml
+1 −0 Cargo.toml
+58 −11 README.md
+6 −3 benches/helpers/miri_helper.rs
+1 −1 rust-version
+206 −182 src/bin/cargo-miri.rs
+6 −2 src/bin/miri-rustc-tests.rs
+43 −24 src/bin/miri.rs
+53 −13 src/fn_call.rs
+32 −14 src/intrinsic.rs
+47 −22 src/lib.rs
+31 −19 src/operator.rs
+31 −31 src/stacked_borrows.rs
+197 −0 test-cargo-miri/Cargo.lock
+3 −0 test-cargo-miri/Cargo.toml
+9 −0 test-cargo-miri/run-test.py
+21 −1 test-cargo-miri/src/main.rs
+1 −1 test-cargo-miri/stderr.ref
+3 −0 test-cargo-miri/stderr.ref2
+8 −2 test-cargo-miri/test.stdout.ref
+11 −0 test-cargo-miri/test.stdout.ref2
+11 −4 test-cargo-miri/tests/test.rs
+1 −1 tests/compile-fail/panic1.rs
+5 −0 tests/compile-fail/panic2.rs
+5 −0 tests/compile-fail/panic3.rs
+5 −0 tests/compile-fail/panic4.rs
+1 −1 tests/compile-fail/stacked_borrows/alias_through_mutation.rs
+1 −1 tests/compile-fail/stacked_borrows/aliasing_mut3.rs
+1 −1 tests/compile-fail/stacked_borrows/box_exclusive_violation1.rs
+1 −1 tests/compile-fail/stacked_borrows/buggy_as_mut_slice.rs
+1 −1 tests/compile-fail/stacked_borrows/buggy_split_at_mut.rs
+1 −1 tests/compile-fail/stacked_borrows/illegal_read1.rs
+1 −1 tests/compile-fail/stacked_borrows/illegal_read2.rs
+1 −1 tests/compile-fail/stacked_borrows/illegal_read3.rs
+1 −1 tests/compile-fail/stacked_borrows/illegal_read4.rs
+1 −1 tests/compile-fail/stacked_borrows/illegal_read5.rs
+1 −1 tests/compile-fail/stacked_borrows/illegal_write2.rs
+1 −1 tests/compile-fail/stacked_borrows/illegal_write3.rs
+1 −1 tests/compile-fail/stacked_borrows/illegal_write5.rs
+1 −1 tests/compile-fail/stacked_borrows/load_invalid_mut.rs
+1 −1 tests/compile-fail/stacked_borrows/outdated_local.rs
+1 −1 tests/compile-fail/stacked_borrows/pass_invalid_mut.rs
+1 −1 tests/compile-fail/stacked_borrows/pointer_smuggling.rs
+1 −1 tests/compile-fail/stacked_borrows/return_invalid_mut.rs
+1 −1 tests/compile-fail/stacked_borrows/return_invalid_mut_option.rs
+1 −1 tests/compile-fail/stacked_borrows/return_invalid_mut_tuple.rs
+1 −1 tests/compile-fail/stacked_borrows/transmute-is-no-escape.rs
+1 −1 tests/compile-fail/stacked_borrows/unescaped_local.rs
+5 −0 tests/run-pass/args.rs
+1 −0 tests/run-pass/args.stdout
+17 −11 tests/run-pass/async-fn.rs
+1 −0 tests/run-pass/format.rs
+1 −0 tests/run-pass/format.stdout
+13 −2 tests/run-pass/function_pointers.rs
+1 −1 tests/run-pass/hashmap.rs
+29 −0 tests/run-pass/heap_system.rs
+40 −0 tests/run-pass/iter.rs
+0 −12 tests/run-pass/iter_any.rs
+0 −12 tests/run-pass/iter_slice.rs
+10 −0 tests/run-pass/rc.rs
+7 −0 tests/run-pass/strings.rs
+8 −0 tests/run-pass/vecdeque.rs
+2 −0 tests/run-pass/vecdeque.stdout
+1 −1 travis.sh