Skip to content

Commit 6edea2c

Browse files
authored
Auto merge of #34216 - jseyfried:nested_cfg_attr, r=nrc
Support nested `cfg_attr` attributes Support arbitrarily deeply nested `cfg_attr` attributes (e.g. `#[cfg_attr(foo, cfg_attr(bar, baz))]`). This makes configuration idempotent. Currently, the nighties do not support any `cfg_attr` nesting. Stable and beta support just one level of `cfg_attr` nesting (expect for attributes on macro-expanded nodes, where no nesting is supported). This is a [breaking-change]. For example, the following would break: ```rust macro_rules! m { () => { #[cfg_attr(all(), cfg_attr(all(), cfg(foo)))] fn f() {} } } m!(); fn main() { f() } //~ ERROR unresolved name `f` ``` r? @nrc
2 parents a479a6a + 65d256e commit 6edea2c

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

src/libsyntax/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ impl<'a> StripUnconfigured<'a> {
7373
};
7474

7575
if attr::cfg_matches(self.config, &cfg, &mut self.diag) {
76-
Some(respan(mi.span, ast::Attribute_ {
76+
self.process_cfg_attr(respan(mi.span, ast::Attribute_ {
7777
id: attr::mk_attr_id(),
7878
style: attr.node.style,
7979
value: mi.clone(),
+14
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)