Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 44 insertions, 0 deletions

diff --git a/tests/ui/nll/get_default.rs b/tests/ui/nll/get_default.rs
new file mode 100644
index 000000000..ffac8a33d
--- /dev/null
+++ b/tests/ui/nll/get_default.rs
@@ -0,0 +1,44 @@
+// Basic test for free regions in the NLL code. This test ought to
+// report an error due to a reborrowing constraint. Right now, we get
+// a variety of errors from the older, AST-based machinery (notably
+// borrowck), and then we get the NLL error at the end.
+
+struct Map {
+}
+
+impl Map {
+    fn get(&self) -> Option<&String> { None }
+    fn set(&mut self, v: String) { }
+}
+
+fn ok(map: &mut Map) -> &String {
+    loop {
+        match map.get() {
+            Some(v) => {
+                return v;
+            }
+            None => {
+                map.set(String::new()); // Ideally, this would not error.
+                //~^ ERROR borrowed as immutable
+            }
+        }
+    }
+}
+
+fn err(map: &mut Map) -> &String {
+    loop {
+        match map.get() {
+            Some(v) => {
+                map.set(String::new()); // Both AST and MIR error here
+                //~^ ERROR borrowed as immutable
+                return v;
+            }
+            None => {
+                map.set(String::new()); // Ideally, just AST would error here
+                //~^ ERROR borrowed as immutable
+            }
+        }
+    }
+}
+
+fn main() { }