diff options
| author | bors <bors@rust-lang.org> | 2015-03-02 20:26:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-02 20:26:39 +0000 |
| commit | 2ca6eaedae9ec4bff2a63f81f473aba653e46ac5 (patch) | |
| tree | c0f79ec53e9f9ca46755b5ddccc42e67ebbb69a7 /src/libsyntax | |
| parent | 1cc8b6ec664f30b43f75551e95299d943c8a4e6a (diff) | |
| parent | c4b1500fec44c4ed967542fda3cd9c104addbb80 (diff) | |
| download | rust-2ca6eaedae9ec4bff2a63f81f473aba653e46ac5.tar.gz rust-2ca6eaedae9ec4bff2a63f81f473aba653e46ac5.zip | |
Auto merge of #22963 - Manishearth:rollup, r=Manishearth
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index ffc136d5a1d..8043bd9bd70 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -173,6 +173,7 @@ pub static KNOWN_ATTRIBUTES: &'static [(&'static str, AttributeType)] = &[ ("plugin_registrar", Normal), ("cfg", Normal), + ("cfg_attr", Normal), ("main", Normal), ("start", Normal), ("test", Normal), |