diff options
| author | bors <bors@rust-lang.org> | 2018-02-10 19:48:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-10 19:48:20 +0000 |
| commit | 45fba43b3d5b4d1944268cf973099bfacb11bf4c (patch) | |
| tree | 60faf17ac0f398109b52b4a99f9094731b7f7bb3 /src/libsyntax | |
| parent | 39abcc04139a0fd24422f422271849dc91e39a88 (diff) | |
| parent | 4a827188cc46d47f75c72dba3a268d5c9f206582 (diff) | |
| download | rust-45fba43b3d5b4d1944268cf973099bfacb11bf4c.tar.gz rust-45fba43b3d5b4d1944268cf973099bfacb11bf4c.zip | |
Auto merge of #48113 - kennytm:rollup, r=kennytm
Rollup of 20 pull requests - Successful merges: #47790, #47835, #47854, #48015, #48047, #48051, #48058, #48059, #48064, #48078, #48080, #48086, #48098, #48101, #48107, #48100, #48085, #48120, #48124, #47547 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 9c6520cd874..ae0556320b0 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -984,6 +984,11 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG "wasm_import_memory attribute is currently unstable", cfg_fn!(wasm_import_memory))), + ("rustc_args_required_const", Whitelisted, Gated(Stability::Unstable, + "rustc_attrs", + "never will be stable", + cfg_fn!(rustc_attrs))), + // Crate level attributes ("crate_name", CrateLevel, Ungated), ("crate_type", CrateLevel, Ungated), |