---

yaml
---
r: 23337
b: refs/heads/master
c: c321cdb
h: refs/heads/master
i:
  23335: 6f6c724
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 849d5649ef0c113d75bf9f9b1c3ddcd9a2508e49
+refs/heads/master: c321cdbac6c4ddd9fedb89e1cc8bce1569347c5a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/typeck/check/alt.rs

@@ -270,6 +270,12 @@ fn check_pat(pcx: pat_ctxt, pat: @ast::pat, expected: ty::t) {
             }
         }
 
+        // Forbid pattern-matching structs with destructors.
+        if ty::has_dtor(tcx, class_id) {
+            tcx.sess.span_err(pat.span, ~"deconstructing struct not allowed \
+                                          in pattern (it has a destructor)");
+        }
+
         // Index the class fields.
         let field_map = std::map::box_str_hash();
         for class_fields.eachi |i, class_field| {

trunk/src/test/compile-fail/disallowed-deconstructing-destructing-struct.rs

@@ -0,0 +1,17 @@
+struct X {
+    x: ~str;
+    drop {
+        error!("value: %s", self.x);
+    }
+}
+
+fn unwrap(+x: X) -> ~str {
+    let X { x: y } = x; //~ ERROR deconstructing struct not allowed in pattern
+    y
+}
+
+fn main() {
+    let x = X { x: ~"hello" };
+    let y = unwrap(x);
+    error!("contents: %s", y);
+}