---

yaml
---
r: 39307
b: refs/heads/incoming
c: 3f78e0e
h: refs/heads/master
i:
  39305: 9a161d5
  39303: 45a9857
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: ac2b0456f4273474c2c2ef39a85ac2ee3be28682
+refs/heads/incoming: 3f78e0ecc03b9e0c7b46c64a4be69343c6a8888a
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/resolve.rs

@@ -4454,11 +4454,17 @@ impl Resolver {
                             let class_def = def_class(class_id);
                             self.record_def(pattern.id, class_def);
                         }
+                        Some(definition @ def_class(class_id))
+                                if self.structs.contains_key(class_id) => {
+                            self.record_def(pattern.id, definition);
+                        }
                         Some(definition @ def_variant(_, variant_id))
                                 if self.structs.contains_key(variant_id) => {
                             self.record_def(pattern.id, definition);
                         }
-                        _ => {
+                        result => {
+                            debug!("(resolving pattern) didn't find struct \
+                                    def: %?", result);
                             self.session.span_err(
                                 path.span,
                                 fmt!("`%s` does not name a structure",

branches/incoming/src/test/auxiliary/struct_destructuring_cross_crate.rs

@@ -0,0 +1,7 @@
+#[crate_type="lib"];
+
+pub struct S {
+    x: int,
+    y: int
+}
+

branches/incoming/src/test/run-pass/struct-destructuring-cross-crate.rs

@@ -0,0 +1,9 @@
+// xfail-fast
+extern mod struct_destructuring_cross_crate;
+
+fn main() {
+    let x = struct_destructuring_cross_crate::S { x: 1, y: 2 };
+    let struct_destructuring_cross_crate::S { x: a, y: b } = x;
+    assert a == 1;
+    assert b == 2;
+}