diff options
| author | Marco Castelluccio <mcastelluccio@mozilla.com> | 2017-06-04 15:54:39 +0100 |
|---|---|---|
| committer | Marco Castelluccio <mcastelluccio@mozilla.com> | 2017-06-04 15:54:39 +0100 |
| commit | ecba8d6a23d8bafd6296d619180a5f3e09bb21b1 (patch) | |
| tree | 6f95b5427b14d9b0d0c8975aa450269c7943649e /src/libsyntax | |
| parent | 1b5a923001c481627d7b1d19d0fe1d3f86e5c5a6 (diff) | |
| parent | 42754ce710a777b38402b12728daf54d68ea2b50 (diff) | |
| download | rust-ecba8d6a23d8bafd6296d619180a5f3e09bb21b1.tar.gz rust-ecba8d6a23d8bafd6296d619180a5f3e09bb21b1.zip | |
Merge branch 'profiling' of github.com:whitequark/rust into profiling
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index b2f52d11db2..7ab0529f518 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -325,6 +325,10 @@ declare_features! ( // rustc internal (active, sanitizer_runtime, "1.17.0", None), + // Used to identify crates that contain the profiler runtime + // rustc internal + (active, profiler_runtime, "1.18.0", None), + // `extern "x86-interrupt" fn()` (active, abi_x86_interrupt, "1.17.0", Some(40180)), @@ -691,6 +695,13 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG identify crates that contain the runtime of a \ sanitizer and will never be stable", cfg_fn!(sanitizer_runtime))), + ("profiler_runtime", Whitelisted, Gated(Stability::Unstable, + "profiler_runtime", + "the `#[profiler_runtime]` attribute is used to \ + identify the `profiler_builtins` crate which \ + contains the profiler runtime and will never be \ + stable", + cfg_fn!(profiler_runtime))), ("allow_internal_unstable", Normal, Gated(Stability::Unstable, "allow_internal_unstable", |