]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #49371 - scottmcm:catch-wrapping, r=nikomatsakis
authorbors <bors@rust-lang.org>
Thu, 12 Apr 2018 05:38:49 +0000 (05:38 +0000)
committerbors <bors@rust-lang.org>
Thu, 12 Apr 2018 05:38:49 +0000 (05:38 +0000)
Add ok-wrapping to catch blocks, per RFC

Updates the `catch{}` lowering to wrap the result in `Try::from_ok`.

r? @nikomatsakis

Fixes #41414
Fixes #43818

1  2 
src/librustc_mir/lib.rs

Simple merge