Auto merge of #4478 - tsurai:master, r=flip1995

[rust.git] / tests / ui / if_same_then_else.rs

diff --git a/tests/ui/if_same_then_else.rs b/tests/ui/if_same_then_else.rs
index 0ec933e87847d2ee6ebee32b216276bea9b6f5cb..ecdc5623ca585b75c9bbabfd098037fb7167f1d3 100644 (file)
--- a/tests/ui/if_same_then_else.rs
+++ b/tests/ui/if_same_then_else.rs
@@ -215,10 +215,10 @@ fn if_same_then_else() -> Result<&'static str, ()> {
     };
 
     if true {
-        try!(Ok("foo"));
+        Ok("foo")?;
     } else {
         //~ ERROR same body as `if` block
-        try!(Ok("foo"));
+        Ok("foo")?;
     }
 
     if true {
@@ -232,6 +232,20 @@ fn if_same_then_else() -> Result<&'static str, ()> {
         return Ok(&foo[0..]);
     }
 
+    if true {
+        let foo = "";
+        return Ok(&foo[0..]);
+    } else if false {
+        let foo = "bar";
+        return Ok(&foo[0..]);
+    } else if true {
+        let foo = "";
+        return Ok(&foo[0..]);
+    } else {
+        let foo = "";
+        return Ok(&foo[0..]);
+    }
+
     // False positive `if_same_then_else`: `let (x, y)` vs. `let (y, x)`; see issue #3559.
     if true {
         let foo = "";