---

yaml
---
r: 21958
b: refs/heads/snap-stage3
c: e0f5f25
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: 38595e66643c3dd47e6f6c8ca443a33398561f8f
+refs/heads/snap-stage3: e0f5f259115b2f45f7290fad48fd32b29ce7b8b7
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -333,6 +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);
                     Some(pprust::item_to_str(item,
                                              extract::interner()))
                 }
@@ -343,12 +344,39 @@ 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 {
+    let node = match item.node {
+        ast::item_class(def, tys) => {
+            let def = @{
+                dtor: None,
+                .. *def
+            };
+            ast::item_class(def, tys)
+        }
+        _ => fail ~"not a struct"
+    };
+
+    @{
+        node: node,
+        .. *item
+    }
+}
+
 #[test]
 fn should_add_struct_defs() {
     let doc = test::mk_doc(~"struct S { field: () }");
     assert doc.cratemod().structs()[0].sig.get().contains("struct S {");
 }
 
+#[test]
+fn should_not_serialize_struct_drop_blocks() {
+    // All we care about are the fields
+    let doc = test::mk_doc(~"struct S { field: (), drop { } }");
+    assert !doc.cratemod().structs()[0].sig.get().contains("drop");
+}
+
 #[cfg(test)]
 mod test {
     fn mk_doc(source: ~str) -> doc::Doc {