---

yaml
---
r: 40268
b: refs/heads/dist-snap
c: 3edccc3
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 768247f393a18ec56d7a92cded2545e6f7d92649
+refs/heads/dist-snap: 3edccc311ef4f29c6bf8676f7a414f8b0ef9360d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libsyntax/fold.rs

@@ -12,6 +12,7 @@ export noop_fold_pat;
 export noop_fold_mod;
 export noop_fold_ty;
 export noop_fold_block;
+export noop_fold_item_underscore;
 export wrap;
 export fold_ty_param;
 export fold_ty_params;

branches/dist-snap/src/rustc/front/config.rs

@@ -27,6 +27,7 @@ fn strip_items(crate: @ast::crate, in_cfg: in_cfg_pred)
         @{fold_mod: |a,b| fold_mod(ctxt, a, b),
           fold_block: fold::wrap(|a,b| fold_block(ctxt, a, b) ),
           fold_foreign_mod: |a,b| fold_foreign_mod(ctxt, a, b),
+          fold_item_underscore: |a,b| fold_item_underscore(ctxt, a, b),
           .. *fold::default_ast_fold()};
 
     let fold = fold::make_fold(precursor);
@@ -79,6 +80,22 @@ fn fold_foreign_mod(cx: ctxt, nm: ast::foreign_mod,
     };
 }
 
+fn fold_item_underscore(cx: ctxt, item: ast::item_, fld: fold::ast_fold) -> ast::item_ {
+    let item = match item {
+        ast::item_impl(a, b, c, Some(methods)) => {
+            let methods = methods.filter(|m| method_in_cfg(cx, *m) );
+            ast::item_impl(a, b, c, Some(methods))
+        }
+        ast::item_trait(a, b, ref methods) => {
+            let methods = methods.filter(|m| trait_method_in_cfg(cx, m) );
+            ast::item_trait(a, b, methods)
+        }
+        _ => item
+    };
+
+    fold::noop_fold_item_underscore(item, fld)
+}
+
 fn filter_stmt(cx: ctxt, &&stmt: @ast::stmt) ->
    Option<@ast::stmt> {
     match stmt.node {
@@ -118,6 +135,17 @@ fn view_item_in_cfg(cx: ctxt, item: @ast::view_item) -> bool {
     return cx.in_cfg(item.attrs);
 }
 
+fn method_in_cfg(cx: ctxt, meth: @ast::method) -> bool {
+    return cx.in_cfg(meth.attrs);
+}
+
+fn trait_method_in_cfg(cx: ctxt, meth: &ast::trait_method) -> bool {
+    match *meth {
+        ast::required(ref meth) => cx.in_cfg(meth.attrs),
+        ast::provided(@ref meth) => cx.in_cfg(meth.attrs)
+    }
+}
+
 // Determine if an item should be translated in the current crate
 // configuration based on the item's attributes
 fn in_cfg(cfg: ast::crate_cfg, attrs: ~[ast::attribute]) -> bool {

branches/dist-snap/src/test/run-pass/conditional-compile.rs

@@ -1,3 +1,7 @@
+// Crate use statements
+#[cfg(bogus)]
+use flippity;
+
 #[cfg(bogus)]
 const b: bool = false;
 
@@ -115,4 +119,34 @@ mod test_use_statements {
         #[cfg(bogus)]
         use flippity_foo;
     }
-}
+}
+
+mod test_methods {
+    struct Foo {
+        bar: uint
+    }
+
+    impl Foo: Fooable {
+        #[cfg(bogus)]
+        static fn what() { }
+
+        static fn what() { }
+
+        #[cfg(bogus)]
+        fn the() { }
+
+        fn the() { }
+    }
+
+    trait Fooable {
+        #[cfg(bogus)]
+        static fn what();
+
+        static fn what();
+
+        #[cfg(bogus)]
+        fn the();
+
+        fn the();
+    }
+}