auto merge of #9560 : pcwalton/rust/xc-tuple-structs, r=pcwalton

r? @thestinger

2 files changed, 13 insertions, 2 deletions

diff --git a/src/libsyntax/ast_map.rs b/src/libsyntax/ast_map.rs
index 105d222926e..b3d5e03331c 100644
--- a/src/libsyntax/ast_map.rs
+++ b/src/libsyntax/ast_map.rs
@@ -403,9 +403,9 @@ pub fn map_decoded_item(diag: @mut span_handler,
         diag: diag,
     };
 
-    // methods get added to the AST map when their impl is visited.  Since we
+    // Methods get added to the AST map when their impl is visited.  Since we
     // don't decode and instantiate the impl, but just the method, we have to
-    // add it to the table now:
+    // add it to the table now. Likewise with foreign items.
     match *ii {
         ii_item(*) => {} // fallthrough
         ii_foreign(i) => {
diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs
index 12ad7111f7f..d3a01401fdb 100644
--- a/src/libsyntax/ast_util.rs
+++ b/src/libsyntax/ast_util.rs
@@ -590,6 +590,17 @@ impl Visitor<()> for IdVisitor {
         self.operation.visit_id(struct_field.node.id);
         visit::walk_struct_field(self, struct_field, env)
     }
+
+    fn visit_struct_def(&mut self,
+                        struct_def: @struct_def,
+                        ident: ast::Ident,
+                        generics: &ast::Generics,
+                        id: NodeId,
+                        _: ()) {
+        self.operation.visit_id(id);
+        struct_def.ctor_id.map(|&ctor_id| self.operation.visit_id(ctor_id));
+        visit::walk_struct_def(self, struct_def, ident, generics, id, ());
+    }
 }
 
 pub fn visit_ids_for_inlined_item(item: &inlined_item,