Auto merge of #22827 - sfackler:should_panic_pt1, r=alexcrichton

This needs to make it into the snapshot before #21824 can land. r? @alexcrichton
rust-lang · Feb 26, 2015 · 3a96d6a · 3a96d6a
2 parents 41f8b1e + c3b77ab
commit 3a96d6a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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),