Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 37 insertions, 0 deletions

diff --git a/tests/ui/structs-enums/resource-in-struct.rs b/tests/ui/structs-enums/resource-in-struct.rs
new file mode 100644
index 000000000..9613ca62a
--- /dev/null
+++ b/tests/ui/structs-enums/resource-in-struct.rs
@@ -0,0 +1,37 @@
+// run-pass
+#![allow(non_camel_case_types)]
+
+// Ensures that class dtors run if the object is inside an enum
+// variant
+
+use std::cell::Cell;
+
+type closable<'a> = &'a Cell<bool>;
+
+struct close_res<'a> {
+  i: closable<'a>,
+
+}
+
+impl<'a> Drop for close_res<'a> {
+    fn drop(&mut self) {
+        self.i.set(false);
+    }
+}
+
+fn close_res(i: closable) -> close_res {
+    close_res {
+        i: i
+    }
+}
+
+enum option<T> { none, some(#[allow(unused_tuple_struct_fields)] T), }
+
+fn sink(_res: option<close_res>) { }
+
+pub fn main() {
+    let c = &Cell::new(true);
+    sink(option::none);
+    sink(option::some(close_res(c)));
+    assert!(!c.get());
+}