diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-06-21 10:40:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 10:40:15 -0400 |
| commit | d33e2c5181488c15b14a48bd84dec8b28049dd33 (patch) | |
| tree | 57f627cb4bed95e8643337472050d072fe67f657 /src/libsyntax | |
| parent | 292fcc880fb851d0d582c0bc5a266c77b104fd8b (diff) | |
| parent | 2bec12f03695792998dbbb79bcee02ecfe0cf8f1 (diff) | |
| download | rust-d33e2c5181488c15b14a48bd84dec8b28049dd33.tar.gz rust-d33e2c5181488c15b14a48bd84dec8b28049dd33.zip | |
Rollup merge of #42620 - wesleywiser:compile_error, r=brson
Add compile_error! Related to #40872
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 1 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index c91c77719e6..f8a26287bd4 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -1065,6 +1065,7 @@ 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 4543378789d..d7d3a70f3c7 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -111,6 +111,7 @@ 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)), @@ -1008,6 +1009,9 @@ 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 = |