diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-07-20 15:50:33 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-07-25 07:09:31 -0700 |
| commit | 20b4f86d13b177bf66d1fa4fefbfcc1bb552cb94 (patch) | |
| tree | c53a883de937df40bc562f244fef8c5e5dddc903 /src/libsyntax | |
| parent | daeb6077c87dab99f2d301d06965558b8d064c28 (diff) | |
| download | rust-20b4f86d13b177bf66d1fa4fefbfcc1bb552cb94.tar.gz rust-20b4f86d13b177bf66d1fa4fefbfcc1bb552cb94.zip | |
Stabilize the `compile_error_macro` feature
Stabilizes: * `compile_error!` as a macro defined by rustc Closes #40872
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 1 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index dc0848176d6..f6d56557166 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -1041,7 +1041,6 @@ impl<'feat> ExpansionConfig<'feat> { fn enable_allow_internal_unstable = allow_internal_unstable, fn enable_custom_derive = custom_derive, fn proc_macro_enabled = proc_macro, - fn enable_compile_error = compile_error, } } diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 448f95c93a0..e8de8cf41c9 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -117,7 +117,6 @@ macro_rules! declare_features { declare_features! ( (active, asm, "1.0.0", Some(29722)), - (active, compile_error, "1.20.0", Some(40872)), (active, concat_idents, "1.0.0", Some(29599)), (active, link_args, "1.0.0", Some(29596)), (active, log_syntax, "1.0.0", Some(29598)), @@ -445,6 +444,8 @@ declare_features! ( // Allows the definition of associated constants in `trait` or `impl` // blocks. (accepted, associated_consts, "1.20.0", Some(29646)), + // Usage of the `compile_error!` macro + (accepted, compile_error, "1.20.0", Some(40872)), ); // If you change this, please modify src/doc/unstable-book as well. You must @@ -1040,9 +1041,6 @@ pub const EXPLAIN_LOG_SYNTAX: &'static str = pub const EXPLAIN_CONCAT_IDENTS: &'static str = "`concat_idents` is not stable enough for use and is subject to change"; -pub const EXPLAIN_COMPILE_ERROR: &'static str = - "`compile_error` is not stable enough for use and is subject to change"; - pub const EXPLAIN_TRACE_MACROS: &'static str = "`trace_macros` is not stable enough for use and is subject to change"; pub const EXPLAIN_ALLOW_INTERNAL_UNSTABLE: &'static str = |