rustc: Box struct_defs

6 files changed, 6 insertions, 6 deletions

diff --git a/src/rustc/metadata/encoder.rs b/src/rustc/metadata/encoder.rs
index 4c535f8af09..a0e9c875f06 100644
--- a/src/rustc/metadata/encoder.rs
+++ b/src/rustc/metadata/encoder.rs
@@ -242,7 +242,7 @@ fn encode_module_item_paths(ebml_w: ebml::writer, ecx: @encode_ctxt,
 }
 
 fn encode_struct_def(ebml_w: ebml::writer,
-                     struct_def: ast::struct_def,
+                     struct_def: @ast::struct_def,
                      path: ~[ast::ident],
                      ident: ast::ident,
                      &index: ~[entry<~str>]) {
diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs
index 11643f8a5ee..c4ea48e3d41 100644
--- a/src/rustc/middle/trans/base.rs
+++ b/src/rustc/middle/trans/base.rs
@@ -4909,7 +4909,7 @@ fn trans_item(ccx: @crate_ctxt, item: ast::item) {
     }
 }
 
-fn trans_struct_def(ccx: @crate_ctxt, struct_def: ast::struct_def,
+fn trans_struct_def(ccx: @crate_ctxt, struct_def: @ast::struct_def,
                     tps: ~[ast::ty_param], path: @ast_map::path,
                     ident: ast::ident, id: ast::node_id) {
     if tps.len() == 0u {
diff --git a/src/rustc/middle/ty.rs b/src/rustc/middle/ty.rs
index 285e0068f66..aa33f355f22 100644
--- a/src/rustc/middle/ty.rs
+++ b/src/rustc/middle/ty.rs
@@ -2742,7 +2742,7 @@ fn ty_dtor(cx: ctxt, class_id: def_id) -> option<def_id> {
     if is_local(class_id) {
        match cx.items.find(class_id.node) {
            some(ast_map::node_item(@{
-               node: ast::item_class({ dtor: some(dtor), _ }, _),
+               node: ast::item_class(@{ dtor: some(dtor), _ }, _),
                _
            }, _)) =>
                some(local_def(dtor.node.id)),
diff --git a/src/rustc/middle/typeck/check.rs b/src/rustc/middle/typeck/check.rs
index cb723bca83d..0c59559db76 100644
--- a/src/rustc/middle/typeck/check.rs
+++ b/src/rustc/middle/typeck/check.rs
@@ -400,7 +400,7 @@ fn check_no_duplicate_fields(tcx: ty::ctxt, fields:
 
 }
 
-fn check_struct(ccx: @crate_ctxt, struct_def: ast::struct_def,
+fn check_struct(ccx: @crate_ctxt, struct_def: @ast::struct_def,
                 id: ast::node_id, span: span) {
     let tcx = ccx.tcx;
     let class_t = {self_ty: ty::node_id_to_type(tcx, id), node_id: id};
diff --git a/src/rustc/middle/typeck/coherence.rs b/src/rustc/middle/typeck/coherence.rs
index 539c0ea2e5a..7c9035f3cdf 100644
--- a/src/rustc/middle/typeck/coherence.rs
+++ b/src/rustc/middle/typeck/coherence.rs
@@ -517,7 +517,7 @@ class CoherenceChecker {
         }
     }
 
-    fn create_impl_from_struct(struct_def: ast::struct_def,
+    fn create_impl_from_struct(struct_def: @ast::struct_def,
                                ident: ast::ident,
                                id: node_id)
                             -> @Impl {
diff --git a/src/rustc/middle/typeck/collect.rs b/src/rustc/middle/typeck/collect.rs
index eb2f31d1c16..abbe5eb40ee 100644
--- a/src/rustc/middle/typeck/collect.rs
+++ b/src/rustc/middle/typeck/collect.rs
@@ -445,7 +445,7 @@ fn convert(ccx: @crate_ctxt, it: @ast::item) {
     }
 }
 
-fn convert_struct(ccx: @crate_ctxt, rp: bool, struct_def: ast::struct_def,
+fn convert_struct(ccx: @crate_ctxt, rp: bool, struct_def: @ast::struct_def,
                   tps: ~[ast::ty_param], tpt: ty::ty_param_bounds_and_ty,
                   id: ast::node_id) {
     let tcx = ccx.tcx;