diff options
| author | bors <bors@rust-lang.org> | 2017-06-21 15:26:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-21 15:26:55 +0000 |
| commit | 622e7e6487b6fb7fdbb901720cd4214f9179ed67 (patch) | |
| tree | 051abe6de044e63838f39659bdeac430d11cf4ff /src/libsyntax | |
| parent | 39220a9d9febbf8df995501f4271ce3d664559dd (diff) | |
| parent | 80e14a0fe309e898e22fe9016a6e04dd16ba5f23 (diff) | |
| download | rust-622e7e6487b6fb7fdbb901720cd4214f9179ed67.tar.gz rust-622e7e6487b6fb7fdbb901720cd4214f9179ed67.zip | |
Auto merge of #42802 - frewsxcv:rollup, r=frewsxcv
Rollup of 4 pull requests - Successful merges: #42397, #42620, #42762, #42766 - Failed merges:
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 = |