about summary refs log tree commit diff
path: root/src/libstd/alloc.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-28 06:26:46 +0000
committerbors <bors@rust-lang.org>2018-04-28 06:26:46 +0000
commit207bc403799e4a8a04f873be94834ccc09c1412b (patch)
tree093df6cf438b7bfc2d8b79897cd8a60661e6ea2c /src/libstd/alloc.rs
parent1eb0cef62b3e83bf7ce6bc7d1b99e130648a55e8 (diff)
parent64bcbca81b25a8c7192ffa5a16c824c59aa2b0a2 (diff)
downloadrust-207bc403799e4a8a04f873be94834ccc09c1412b.tar.gz
rust-207bc403799e4a8a04f873be94834ccc09c1412b.zip
Auto merge of #49826 - cuviper:rustc-main-ICE, r=alexcrichton
rustc_driver: Catch ICEs on the main thread too

#48575 introduced an optimization to run rustc directly on the main thread when possible.  However, the threaded code detects panics when they `join()` to report as an ICE.  When running directly, we need to use `panic::catch_unwind` to get the same effect.

cc @ishitatsuyuki
r? @alexcrichton
Diffstat (limited to 'src/libstd/alloc.rs')
0 files changed, 0 insertions, 0 deletions