Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 49 deletions

diff --git a/src/test/ui/nll/enum-drop-access.rs b/src/test/ui/nll/enum-drop-access.rs
deleted file mode 100644
index 5ef0c3fe7..000000000
--- a/src/test/ui/nll/enum-drop-access.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-enum DropOption<T> {
-    Some(T),
-    None,
-}
-
-impl<T> Drop for DropOption<T> {
-    fn drop(&mut self) {}
-}
-
-// Dropping opt could access the value behind the reference,
-fn drop_enum(opt: DropOption<&mut i32>) -> Option<&mut i32> {
-    match opt {
-        DropOption::Some(&mut ref mut r) => { //~ ERROR
-            Some(r)
-        },
-        DropOption::None => None,
-    }
-}
-
-fn optional_drop_enum(opt: Option<DropOption<&mut i32>>) -> Option<&mut i32> {
-    match opt {
-        Some(DropOption::Some(&mut ref mut r)) => { //~ ERROR
-            Some(r)
-        },
-        Some(DropOption::None) | None => None,
-    }
-}
-
-// Ok, dropping opt doesn't access the reference
-fn optional_tuple(opt: Option<(&mut i32, String)>) -> Option<&mut i32> {
-    match opt {
-        Some((&mut ref mut r, _)) => {
-            Some(r)
-        },
-        None => None,
-    }
-}
-
-// Ok, dropping res doesn't access the Ok case.
-fn different_variants(res: Result<&mut i32, String>) -> Option<&mut i32> {
-    match res {
-        Ok(&mut ref mut r) => {
-            Some(r)
-        },
-        Err(_) => None,
-    }
-}
-
-fn main() {}