Auto merge of #1827 - l4l:patch-1, r=RalfJung

Specify miri toolchain for CI example

In particular current example doesn't work if you have a rust-toolchain file in the project.

diff --git a/rust-version b/rust-version
index 81334a8d5a08b8ca58fc5eb94b0e16f48661e465..7d2e8afafacb73730e957e88f4039afc67c4783e 100644 (file)
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-cc9610bf5af1d5c54968db0dd899595ca12307a0
+a50d72158e08e02cfc051b863017bdbd2c45b637

diff --git a/tests/run-pass/panic/catch_panic.stderr b/tests/run-pass/panic/catch_panic.stderr
index 696dbc1f81813a55ef3198d611748beabed7704b..0f43ab2520a57f704f49948cd0699975ec3577ad 100644 (file)
--- a/tests/run-pass/panic/catch_panic.stderr
+++ b/tests/run-pass/panic/catch_panic.stderr
@@ -5,7 +5,7 @@ thread 'main' panicked at 'Hello from panic: 1', $DIR/catch_panic.rs:LL:26
 Caught panic message (String): Hello from panic: 1
 thread 'main' panicked at 'Hello from panic: 2', $DIR/catch_panic.rs:LL:26
 Caught panic message (String): Hello from panic: 2
-thread 'main' panicked at 'Box<Any>', $DIR/catch_panic.rs:LL:27
+thread 'main' panicked at 'Box<dyn Any>', $DIR/catch_panic.rs:LL:27
 Failed to get caught panic message.
 thread 'main' panicked at 'Hello from panic: core', $DIR/catch_panic.rs:LL:27
 Caught panic message (&str): Hello from panic: core