about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2020-07-11 08:53:29 -0700
committerGitHub <noreply@github.com>2020-07-11 08:53:29 -0700
commit95c5fb850e6b8bf2a5e4a69775b9254812afcfbc (patch)
tree0ca16e0243d13bb807b846372dd2d147fc0b95d8
parentaa04ffb61a3e563eb4555057f897191f3ab49386 (diff)
parent6bda2e8a7dbd5e0c0263b26ab89f9fe62920824c (diff)
downloadrust-95c5fb850e6b8bf2a5e4a69775b9254812afcfbc.tar.gz
rust-95c5fb850e6b8bf2a5e4a69775b9254812afcfbc.zip
Rollup merge of #74241 - RalfJung:miri, r=RalfJung
update miri

This incorporates https://github.com/rust-lang/miri/pull/1474. [Last time](https://github.com/rust-lang/rust/pull/74146) that change caused trouble but I fixed xargo since then and [now it should work](https://github.com/rust-lang/rust/pull/74146#issuecomment-657051446).

Cc @rust-lang/miri r? @ghost
m---------src/tools/miri16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/tools/miri b/src/tools/miri
-Subproject eb5ff1791be706d173b4f4c29e9c0529b4235c0
+Subproject eee22ffddab20f51e1866bcbe4c5a69a90bdd26