Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/ui/or-patterns/inconsistent-modes.rs b/tests/ui/or-patterns/inconsistent-modes.rs
new file mode 100644
index 000000000..a87a10ce8
--- /dev/null
+++ b/tests/ui/or-patterns/inconsistent-modes.rs
@@ -0,0 +1,25 @@
+// This test ensures that or patterns require binding mode consistency across arms.
+
+#![allow(non_camel_case_types)]
+fn main() {
+    // One level:
+    let (Ok(a) | Err(ref a)): Result<&u8, u8> = Ok(&0);
+    //~^ ERROR variable `a` is bound inconsistently
+    let (Ok(ref mut a) | Err(a)): Result<u8, &mut u8> = Ok(0);
+    //~^ ERROR variable `a` is bound inconsistently
+    let (Ok(ref a) | Err(ref mut a)): Result<&u8, &mut u8> = Ok(&0);
+    //~^ ERROR variable `a` is bound inconsistently
+    //~| ERROR mismatched types
+    let (Ok((ref a, b)) | Err((ref mut a, ref b))) = Ok((0, &0));
+    //~^ ERROR variable `a` is bound inconsistently
+    //~| ERROR variable `b` is bound inconsistently
+    //~| ERROR mismatched types
+
+    // Two levels:
+    let (Ok(Ok(a) | Err(a)) | Err(ref a)) = Err(0);
+    //~^ ERROR variable `a` is bound inconsistently
+
+    // Three levels:
+    let (Ok([Ok((Ok(ref a) | Err(a),)) | Err(a)]) | Err(a)) = Err(&1);
+    //~^ ERROR variable `a` is bound inconsistently
+}