about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2018-06-04 10:58:56 +0530
committerGitHub <noreply@github.com>2018-06-04 10:58:56 +0530
commit72f2f1935dbdcac023f2f682226792f2ad79315a (patch)
treefe325dfcda1636171bf779081f30c6e1e7163e9e /src/libsyntax
parentbc7416213c20e165ebe723c4328667e8008c0794 (diff)
parent6232478d26b0feca02fd6660edbf78a5c6327ec5 (diff)
downloadrust-72f2f1935dbdcac023f2f682226792f2ad79315a.tar.gz
rust-72f2f1935dbdcac023f2f682226792f2ad79315a.zip
Merge branch 'master' into stabilise/termination-test
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 9adfb61d92d..17118e4dff2 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -473,6 +473,8 @@ declare_features! (
     // 'a: { break 'a; }
     (active, label_break_value, "1.28.0", Some(48594), None),
 
+    // #[panic_implementation]
+    (active, panic_implementation, "1.28.0", Some(44489), None),
 );
 
 declare_features! (
@@ -1069,6 +1071,12 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG
                                  "attribute is currently unstable",
                                  cfg_fn!(wasm_custom_section))),
 
+    // RFC 2070
+    ("panic_implementation", Normal, Gated(Stability::Unstable,
+                           "panic_implementation",
+                           "#[panic_implementation] is an unstable feature",
+                           cfg_fn!(panic_implementation))),
+
     // Crate level attributes
     ("crate_name", CrateLevel, Ungated),
     ("crate_type", CrateLevel, Ungated),