---

yaml
---
r: 52323
b: refs/heads/dist-snap
c: bd6536f
h: refs/heads/master
i:
  52321: 2015df4
  52319: 4f5eb59
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: a4eb76abd0b43c3e0d38cebd2c227a06e3b6edc4
+refs/heads/dist-snap: bd6536f8687b1b4fb166594ed5cf79db0ec1436d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/front/test.rs

@@ -86,24 +86,20 @@ fn strip_test_functions(crate: @ast::crate) -> @ast::crate {
 
 fn fold_mod(cx: test_ctxt, m: ast::_mod, fld: fold::ast_fold) -> ast::_mod {
 
-    // Remove any defined main function from the AST so it doesn't clash with
+    // Remove any #[main] from the AST so it doesn't clash with
     // the one we're going to add. Only if compiling an executable.
 
-    fn nomain(cx: test_ctxt, item: @ast::item) -> Option<@ast::item> {
-        match item.node {
-          ast::item_fn(*) => {
-            if attrs_contains_name(item.attrs, ~"main")
-                    && !cx.sess.building_library {
-                option::None
-            } else { option::Some(item) }
-          }
-          _ => option::Some(item)
-        }
+    fn nomain(cx: test_ctxt, item: @ast::item) -> @ast::item {
+        if !cx.sess.building_library {
+            @ast::item{attrs: item.attrs.filtered(|attr| {
+                               attr::get_attr_name(*attr) != ~"main"
+                           }),.. copy *item}
+        } else { item }
     }
 
     let mod_nomain =
         {view_items: /*bad*/copy m.view_items,
-         items: vec::filter_map(m.items, |i| nomain(cx, *i))};
+         items: vec::map(m.items, |i| nomain(cx, *i))};
     return fold::noop_fold_mod(mod_nomain, fld);
 }