Adding upstream version 1.64.0+dfsg1.upstream/1.64.0+dfsg1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 44 insertions, 0 deletions

diff --git a/src/test/ui/nll/lub-if.rs b/src/test/ui/nll/lub-if.rs
new file mode 100644
index 000000000..50225a783
--- /dev/null
+++ b/src/test/ui/nll/lub-if.rs
@@ -0,0 +1,44 @@
+// Test that we correctly consider the type of `match` to be the LUB
+// of the various arms, particularly in the case where regions are
+// involved.
+
+pub fn opt_str0<'a>(maybestr: &'a Option<String>) -> &'a str {
+    if maybestr.is_none() {
+        "(none)"
+    } else {
+        let s: &'a str = maybestr.as_ref().unwrap();
+        s
+    }
+}
+
+pub fn opt_str1<'a>(maybestr: &'a Option<String>) -> &'a str {
+    if maybestr.is_some() {
+        let s: &'a str = maybestr.as_ref().unwrap();
+        s
+    } else {
+        "(none)"
+    }
+}
+
+pub fn opt_str2<'a>(maybestr: &'a Option<String>) -> &'static str {
+    if maybestr.is_none() {
+        "(none)"
+    } else {
+        let s: &'a str = maybestr.as_ref().unwrap();
+        s
+        //~^ ERROR lifetime may not live long enough
+    }
+}
+
+pub fn opt_str3<'a>(maybestr: &'a Option<String>) -> &'static str {
+    if maybestr.is_some() {
+        let s: &'a str = maybestr.as_ref().unwrap();
+        s
+        //~^ ERROR lifetime may not live long enough
+    } else {
+        "(none)"
+    }
+}
+
+
+fn main() {}