Merge from rustc

1 files changed, 5 insertions, 2 deletions

diff --git a/tests/coverage/coroutine.coverage b/tests/coverage/coroutine.coverage
index 3a9791a0dbd..bd3d4e46880 100644
--- a/tests/coverage/coroutine.coverage
+++ b/tests/coverage/coroutine.coverage
@@ -9,8 +9,11 @@
    LL|       |// drop all `Counter` `Coverage` statements from a MIR. `simplify.rs` has logic
    LL|       |// to handle this condition, and still report dead block coverage.
    LL|      1|fn get_u32(val: bool) -> Result<u32, String> {
-   LL|      1|    if val { Ok(1) } else { Err(String::from("some error")) }
-                                          ^0
+   LL|      1|    if val {
+   LL|      1|        Ok(1)
+   LL|       |    } else {
+   LL|      0|        Err(String::from("some error"))
+   LL|       |    }
    LL|      1|}
    LL|       |
    LL|      1|fn main() {