about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-02-27 13:32:37 +0100
committerGitHub <noreply@github.com>2019-02-27 13:32:37 +0100
commit1394b6f3a1e607e3651f90e929ccd357c9f8bf80 (patch)
tree8700239df90e3f26fa0717179736bc86abd1c1f7 /src
parent5910271b9148f0d62de18c86cfffbf77bec234f8 (diff)
parentf313baedba2d73e1a24df77483ac24622de201ae (diff)
downloadrust-1394b6f3a1e607e3651f90e929ccd357c9f8bf80.tar.gz
rust-1394b6f3a1e607e3651f90e929ccd357c9f8bf80.zip
Rollup merge of #58761 - Mark-Simulacrum:add-feature-gate-unwind, r=Centril
Add tracking issue for the unwind attribute

cc https://github.com/rust-lang/rust/issues/58760
Diffstat (limited to 'src')
-rw-r--r--src/libsyntax/feature_gate.rs4
-rw-r--r--src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 8df1f38d60d..669c68eda39 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -233,8 +233,8 @@ declare_features! (
 
     // Allows `#[unwind(..)]`.
     //
-    // rustc internal for rust runtime
-    (active, unwind_attributes, "1.4.0", None, None),
+    // Permits specifying whether a function should permit unwinding or abort on unwind.
+    (active, unwind_attributes, "1.4.0", Some(58760), None),
 
     // Allows the use of `#[naked]` on functions.
     (active, naked_functions, "1.9.0", Some(32408), None),
diff --git a/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr b/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr
index 918d40d681b..77f2f13c99e 100644
--- a/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr
+++ b/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr
@@ -1,4 +1,4 @@
-error[E0658]: #[unwind] is experimental
+error[E0658]: #[unwind] is experimental (see issue #58760)
   --> $DIR/feature-gate-unwind-attributes.rs:11:5
    |
 LL |     #[unwind(allowed)] //~ ERROR #[unwind] is experimental