about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-02-26 09:23:36 +0000
committerbors <bors@rust-lang.org>2015-02-26 09:23:36 +0000
commit3a96d6a9818fe2affc98a187fb1065120458cee9 (patch)
tree5f041526a4c064b284cba45b97987c78c3d4afff /src/libsyntax
parent41f8b1e89b5ca0c79d7bca782ca44085624d4564 (diff)
parentc3b77ab41c7b2802d081d788dd020961895120a7 (diff)
downloadrust-3a96d6a9818fe2affc98a187fb1065120458cee9.tar.gz
rust-3a96d6a9818fe2affc98a187fb1065120458cee9.zip
Auto merge of #22827 - sfackler:should_panic_pt1, r=alexcrichton
This needs to make it into the snapshot before #21824 can land.

r? @alexcrichton 
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index c1865ffa9d9..ffc136d5a1d 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -187,6 +187,7 @@ pub static KNOWN_ATTRIBUTES: &'static [(&'static str, AttributeType)] = &[
     ("no_link", Normal),
     ("derive", Normal),
     ("should_fail", Normal),
+    ("should_panic", Normal),
     ("ignore", Normal),
     ("no_implicit_prelude", Normal),
     ("reexport_test_harness_main", Normal),