summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-10-01 09:22:15 +0000
committerbors <bors@rust-lang.org>2014-10-01 09:22:15 +0000
commitff2616e847ddf913e007d715732b5669b0f22672 (patch)
treee279e0568b2bc92c8f99d01a02a45a3a1fe040ee /src/libsyntax/ext
parent60e7317345f246a8169bbfe721473f693d54cade (diff)
parentb4909f6eb713b51c73010e888053a1aed7b8fb64 (diff)
downloadrust-ff2616e847ddf913e007d715732b5669b0f22672.tar.gz
rust-ff2616e847ddf913e007d715732b5669b0f22672.zip
auto merge of #17630 : sfackler/rust/cfg-warnings, r=brson
Closes #17490
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/cfg.rs3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libsyntax/ext/cfg.rs b/src/libsyntax/ext/cfg.rs
index 342e7e6d52e..74039da6cab 100644
--- a/src/libsyntax/ext/cfg.rs
+++ b/src/libsyntax/ext/cfg.rs
@@ -38,14 +38,11 @@ pub fn expand_cfg<'cx>(cx: &mut ExtCtxt,
         p.expect(&token::COMMA);
     }
 
-    // NOTE: turn on after snapshot
-    /*
     if cfgs.len() != 1 {
         cx.span_warn(sp, "The use of multiple cfgs at the top level of `cfg!` \
                           is deprecated. Change `cfg!(a, b)` to \
                           `cfg!(all(a, b))`.");
     }
-    */
 
     let matches_cfg = cfgs.iter().all(|cfg| attr::cfg_matches(&cx.parse_sess.span_diagnostic,
                                                               cx.cfg.as_slice(), &**cfg));