Auto merge of #1828 - hyd-dev:rustup, r=RalfJung

bors · bors · commit c8713c2f9fc1 · 2021-06-08T15:15:05.000Z
Update `Box<Any>` to `Box<dyn Any>` in `catch_panic.stderr` https://github.com/rust-lang-ci/rust/runs/2771244703#step:25:9487 cc rust-lang/rust#86133 rust-lang/rust#86074
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-cc9610bf5af1d5c54968db0dd899595ca12307a0`
	`1`	`+a50d72158e08e02cfc051b863017bdbd2c45b637`