diff options
| author | Steven Fackler <sfackler@gmail.com> | 2014-09-28 20:28:18 -0700 |
|---|---|---|
| committer | Steven Fackler <sfackler@palantir.com> | 2014-09-30 12:52:00 -0700 |
| commit | 92013a849da3dd9940933b687da6f83b6dd066a8 (patch) | |
| tree | 586fe3c5298966b229461e932b20e9b746e568d2 /src/libsyntax | |
| parent | fa6b2d4c3b81e6adcfae87dac25fb7d50b2dd39f (diff) | |
| download | rust-92013a849da3dd9940933b687da6f83b6dd066a8.tar.gz rust-92013a849da3dd9940933b687da6f83b6dd066a8.zip | |
Turn on cfg format warnings
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/attr.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/config.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/ext/cfg.rs | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index 8963185192a..1491f02b3f5 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -315,14 +315,11 @@ pub fn cfg_matches(diagnostic: &SpanHandler, cfgs: &[P<MetaItem>], cfg: &ast::Me ast::MetaList(ref pred, ref mis) if pred.get() == "all" => mis.iter().all(|mi| cfg_matches(diagnostic, cfgs, &**mi)), ast::MetaList(ref pred, ref mis) if pred.get() == "not" => { - // NOTE: turn on after snapshot - /* if mis.len() != 1 { diagnostic.span_warn(cfg.span, "the use of multiple cfgs in the same `not` \ statement is deprecated. Change `not(a, b)` to \ `not(all(a, b))`."); } - */ !mis.iter().all(|mi| cfg_matches(diagnostic, cfgs, &**mi)) } ast::MetaList(ref pred, _) => { diff --git a/src/libsyntax/config.rs b/src/libsyntax/config.rs index 5b17f6f004a..c5ef2399b1a 100644 --- a/src/libsyntax/config.rs +++ b/src/libsyntax/config.rs @@ -260,8 +260,6 @@ fn in_cfg(diagnostic: &SpanHandler, cfg: &[P<ast::MetaItem>], attrs: &[ast::Attr _ => continue }; - // NOTE: turn on after snapshot - /* if mis.len() != 1 { diagnostic.span_warn(attr.span, "The use of multiple cfgs in the top level of \ `#[cfg(..)]` is deprecated. Change `#[cfg(a, b)]` to \ @@ -274,7 +272,6 @@ fn in_cfg(diagnostic: &SpanHandler, cfg: &[P<ast::MetaItem>], attrs: &[ast::Attr the intersection of the cfgs. Change `#[cfg(a)] \ #[cfg(b)]` to `#[cfg(any(a, b))]`."); } - */ seen_cfg = true; in_cfg |= mis.iter().all(|mi| attr::cfg_matches(diagnostic, cfg, &**mi)); 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)); |