2 files changed, 72 insertions, 0 deletions
diff --git a/tests/ui/drop/drop-once-on-move.rs b/tests/ui/drop/drop-once-on-move.rs
new file mode 100644
index 00000000000..da018058076
--- /dev/null
+++ b/tests/ui/drop/drop-once-on-move.rs
@@ -0,0 +1,35 @@
+//! Check that types not implementing `Copy` are moved, not copied, during assignment
+//! operations, and their `Drop` implementation is called exactly once when the
+//! value goes out of scope.
+
+//@ run-pass
+
+#![allow(non_camel_case_types)]
+use std::cell::Cell;
+
+#[derive(Debug)]
+struct r<'a> {
+    i: &'a Cell<isize>,
+}
+
+impl<'a> Drop for r<'a> {
+    fn drop(&mut self) {
+        self.i.set(self.i.get() + 1);
+    }
+}
+
+fn r(i: &Cell<isize>) -> r<'_> {
+    r { i }
+}
+
+pub fn main() {
+    let i = &Cell::new(0);
+    // Even though these look like copies, they are guaranteed not to be
+    {
+        let a = r(i);
+        let b = (a, 10);
+        let (c, _d) = b;
+        println!("{:?}", c);
+    }
+    assert_eq!(i.get(), 1);
+}
diff --git a/tests/ui/drop/drop-scope-exit.rs b/tests/ui/drop/drop-scope-exit.rs
new file mode 100644
index 00000000000..4d003fec712
--- /dev/null
+++ b/tests/ui/drop/drop-scope-exit.rs
@@ -0,0 +1,37 @@
+//! Check that the `Drop` implementation is called when a value goes out of scope.
+
+//@ run-pass
+
+#![allow(non_camel_case_types)]
+use std::cell::Cell;
+
+struct shrinky_pointer<'a> {
+    i: &'a Cell<isize>,
+}
+
+impl<'a> Drop for shrinky_pointer<'a> {
+    fn drop(&mut self) {
+        println!("Hello!");
+        self.i.set(self.i.get() - 1);
+    }
+}
+
+impl<'a> shrinky_pointer<'a> {
+    pub fn look_at(&self) -> isize {
+        return self.i.get();
+    }
+}
+
+fn shrinky_pointer(i: &Cell<isize>) -> shrinky_pointer<'_> {
+    shrinky_pointer { i }
+}
+
+pub fn main() {
+    let my_total = &Cell::new(10);
+    {
+        let pt = shrinky_pointer(my_total);
+        assert_eq!(pt.look_at(), 10);
+    }
+    println!("my_total = {}", my_total.get());
+    assert_eq!(my_total.get(), 9);
+}