---

yaml
---
r: 21960
b: refs/heads/snap-stage3
c: 0bd02b1
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 5558ebb6b7bf54a370111a46ea7c75b5becf85ec
+refs/heads/snap-stage3: 0bd02b113c02c1b3eea33cc339d71697a316d412
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/rustdoc/tystr_pass.rs

@@ -333,7 +333,7 @@ fn fold_struct(
         sig: do astsrv::exec(srv) |ctxt| {
             match ctxt.ast_map.get(doc.id()) {
                 ast_map::node_item(item, _) => {
-                    let item = strip_struct_drop_block(item);
+                    let item = strip_struct_extra_stuff(item);
                     Some(pprust::item_to_str(item,
                                              extract::interner()))
                 }
@@ -344,13 +344,15 @@ fn fold_struct(
     }
 }
 
-/// Removes the drop block from structs so that they aren't displayed
-/// as part of the type
-fn strip_struct_drop_block(item: @ast::item) -> @ast::item {
+/// Removes various things from the struct item definition that
+/// shouldn't be displayed in the struct signature. Probably there
+/// should be a simple pprust::struct_to_str function that does
+/// what I actually want
+fn strip_struct_extra_stuff(item: @ast::item) -> @ast::item {
     let node = match item.node {
         ast::item_class(def, tys) => {
             let def = @{
-                dtor: None,
+                dtor: None, // Remove the drop { } block
                 .. *def
             };
             ast::item_class(def, tys)
@@ -359,6 +361,7 @@ fn strip_struct_drop_block(item: @ast::item) -> @ast::item {
     };
 
     @{
+        attrs: ~[], // Remove the attributes
         node: node,
         .. *item
     }
@@ -377,6 +380,13 @@ fn should_not_serialize_struct_drop_blocks() {
     assert !doc.cratemod().structs()[0].sig.get().contains("drop");
 }
 
+#[test]
+fn should_not_serialize_struct_attrs() {
+    // All we care about are the fields
+    let doc = test::mk_doc(~"#[wut] struct S { field: () }");
+    assert !doc.cratemod().structs()[0].sig.get().contains("wut");
+}
+
 #[cfg(test)]
 mod test {
     fn mk_doc(source: ~str) -> doc::Doc {