Rollup merge of #42620 - wesleywiser:compile_error, r=brson

Add compile_error!

Related to #40872

2 files changed, 28 insertions, 0 deletions

diff --git a/src/test/compile-fail/compile_error_macro.rs b/src/test/compile-fail/compile_error_macro.rs
new file mode 100644
index 00000000000..2a2c3fd8092
--- /dev/null
+++ b/src/test/compile-fail/compile_error_macro.rs
@@ -0,0 +1,15 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(compile_error)]
+
+fn main() {
+    compile_error!("a very descriptive error message"); //~ ERROR: a very descriptive error message
+}
diff --git a/src/test/compile-fail/feature-gate-compile_error.rs b/src/test/compile-fail/feature-gate-compile_error.rs
new file mode 100644
index 00000000000..545c6852961
--- /dev/null
+++ b/src/test/compile-fail/feature-gate-compile_error.rs
@@ -0,0 +1,13 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn main() {
+    compile_error!("test"); //~ ERROR: `compile_error` is not stable enough
+}