---

yaml
---
r: 16331
b: refs/heads/try
c: 0327dc0
h: refs/heads/master
i:
  16329: d4cb1ff
  16327: a92be2b
v: v3

Author: catamorphism

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: de4f0b92b631a0a35de6ee118df37102e96e8744
+refs/heads/try: 0327dc0b188ee536eb6865cf202f03c88864f4fb
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libsyntax/print/pprust.rs

@@ -539,6 +539,7 @@ fn print_item(s: ps, &&item: @ast::item) {
           print_block(s, ctor.node.body);
           option::iter(m_dtor) {|dtor|
             hardbreak_if_not_bol(s);
+            maybe_print_comment(s, dtor.span.lo);
             head(s, "drop");
             print_block(s, dtor.node.body);
           }

branches/try/src/test/compile-fail/issue-2487-b.rs

@@ -0,0 +1,19 @@
+class socket {
+    let sock: int;
+
+    new() { self.sock = 1; }
+
+    drop { }
+
+    fn set_identity()  {
+      closure { ||
+        setsockopt_bytes(self.sock) //! ERROR copying a noncopyable value
+      } 
+    }
+}
+
+fn closure(f: fn@()) { f() }
+
+fn setsockopt_bytes(+_sock: int) { }
+
+fn main() {}

branches/try/src/test/run-pass/issue-2487-a.rs

@@ -0,0 +1,19 @@
+class socket {
+    let sock: int;
+
+    new() { self.sock = 1; }
+
+    drop { }
+
+    fn set_identity()  {
+        closure { ||
+            setsockopt_bytes(copy self.sock)
+        }
+    }
+}
+
+fn closure(f: fn()) { f() }
+
+fn setsockopt_bytes(_sock: int) { }
+
+fn main() {}