diff options
| author | bors <bors@rust-lang.org> | 2017-02-09 05:58:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-09 05:58:29 +0000 |
| commit | fd2f8a4536cb9b45abd72b8ff977ad48618602b3 (patch) | |
| tree | 1a4ac51c16de92345ef062bc86eda21c87e5d57b /src/libsyntax | |
| parent | 29dece1c8bbebf7ae8034ef0826b119281730937 (diff) | |
| parent | 1e3e904101087c11612f97bc604941e5ee85b86e (diff) | |
| download | rust-fd2f8a4536cb9b45abd72b8ff977ad48618602b3.tar.gz rust-fd2f8a4536cb9b45abd72b8ff977ad48618602b3.zip | |
Auto merge of #39677 - frewsxcv:rollup, r=frewsxcv
Rollup of 9 pull requests - Successful merges: #37928, #38699, #39589, #39598, #39599, #39641, #39649, #39653, #39671 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index a78c192a120..cc0a67b3d2e 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -328,6 +328,10 @@ declare_features! ( // `extern "msp430-interrupt" fn()` (active, abi_msp430_interrupt, "1.16.0", Some(38487)), + + // Used to identify crates that contain sanitizer runtimes + // rustc internal + (active, sanitizer_runtime, "1.17.0", None), ); declare_features! ( @@ -647,6 +651,12 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG contains compiler-rt intrinsics and will never be \ stable", cfg_fn!(compiler_builtins))), + ("sanitizer_runtime", Whitelisted, Gated(Stability::Unstable, + "sanitizer_runtime", + "the `#[sanitizer_runtime]` attribute is used to \ + identify crates that contain the runtime of a \ + sanitizer and will never be stable", + cfg_fn!(sanitizer_runtime))), ("allow_internal_unstable", Normal, Gated(Stability::Unstable, "allow_internal_unstable", |