diff options
| author | bors <bors@rust-lang.org> | 2018-08-26 04:02:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-08-26 04:02:19 +0000 |
| commit | 691638582ad1029e77e4ceec3a5f0f6a6449841b (patch) | |
| tree | ae6bac52a73cca46785ba3680eaecdb27cad7dbe /src/libsyntax | |
| parent | 36f14b95a2a2849600f7719007b5fe9c4e9bb569 (diff) | |
| parent | 40a38b01641d453a7b0f4d6af853d06b8cfef161 (diff) | |
| download | rust-691638582ad1029e77e4ceec3a5f0f6a6449841b.tar.gz rust-691638582ad1029e77e4ceec3a5f0f6a6449841b.zip | |
Auto merge of #53619 - japaric:panic-handler, r=SimonSapin
add #[panic_handler]; deprecate #[panic_implementation] r? @SimonSapin cc #44489
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index e2a22167b7e..6dd788bf6e2 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -469,8 +469,9 @@ declare_features! ( // Integer match exhaustiveness checking (active, exhaustive_integer_patterns, "1.30.0", Some(50907), None), - // #[panic_implementation] + // RFC 2070: #[panic_implementation] / #[panic_handler] (active, panic_implementation, "1.28.0", Some(44489), None), + (active, panic_handler, "1.30.0", Some(44489), None), // #[doc(keyword = "...")] (active, doc_keyword, "1.28.0", Some(51315), None), @@ -1109,11 +1110,20 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG "infer 'static lifetime requirements", cfg_fn!(infer_static_outlives_requirements))), + // RFC 2070 (deprecated attribute name) + ("panic_implementation", + Normal, + Gated(Stability::Deprecated("https://github.com/rust-lang/rust/issues/44489\ + #issuecomment-415140224"), + "panic_implementation", + "This attribute was renamed to `panic_handler`", + cfg_fn!(panic_implementation))), + // RFC 2070 - ("panic_implementation", Normal, Gated(Stability::Unstable, - "panic_implementation", - "#[panic_implementation] is an unstable feature", - cfg_fn!(panic_implementation))), + ("panic_handler", Normal, Gated(Stability::Unstable, + "panic_handler", + "#[panic_handler] is an unstable feature", + cfg_fn!(panic_handler))), ("alloc_error_handler", Normal, Gated(Stability::Unstable, "alloc_error_handler", |