Skip to content

Commit 65d256e

Browse files
committed
Support nested cfg_attr attributes
1 parent 7d2f75a commit 65d256e

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

src/libsyntax/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl<'a> StripUnconfigured<'a> {
7878
};
7979

8080
if attr::cfg_matches(self.config, &cfg, &mut self.diag) {
81-
Some(respan(mi.span, ast::Attribute_ {
81+
self.process_cfg_attr(respan(mi.span, ast::Attribute_ {
8282
id: attr::mk_attr_id(),
8383
style: attr.node.style,
8484
value: mi.clone(),
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#[cfg_attr(all(), cfg_attr(all(), cfg(foo)))]
12+
fn f() {}
13+
14+
fn main() { f() } //~ ERROR unresolved name `f`

0 commit comments

Comments
 (0)