From 00d500052c72775ab994b5634195976f85b4e0d6 Mon Sep 17 00:00:00 2001
From: Esteban Küber <esteban@commure.com>
Date: Sat, 21 Jul 2018 15:50:46 -0700
Subject: Gate `format_args_nll` behind feature flag

---
 src/libsyntax_ext/format.rs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/libsyntax_ext')

diff --git a/src/libsyntax_ext/format.rs b/src/libsyntax_ext/format.rs
index 9f153c36733..5b8f059fd14 100644
--- a/src/libsyntax_ext/format.rs
+++ b/src/libsyntax_ext/format.rs
@@ -17,6 +17,7 @@ use syntax::ast;
 use syntax::ext::base::*;
 use syntax::ext::base;
 use syntax::ext::build::AstBuilder;
+use syntax::feature_gate;
 use syntax::parse::token;
 use syntax::ptr::P;
 use syntax::symbol::Symbol;
@@ -693,6 +694,20 @@ pub fn expand_format_args_nl<'cx>(ecx: &'cx mut ExtCtxt,
                                   mut sp: Span,
                                   tts: &[tokenstream::TokenTree])
                                   -> Box<dyn base::MacResult + 'cx> {
+    //if !ecx.ecfg.enable_allow_internal_unstable() {
+
+    // For some reason, the only one that actually works for `println` is the first check
+    if !sp.allows_unstable()   // the enclosing span is marked as `#[allow_insternal_unsable]`
+        || !ecx.ecfg.enable_allow_internal_unstable()  // NOTE: when is this enabled?
+        || !ecx.ecfg.enable_format_args_nl()  // enabled using `#[feature(format_args_nl]`
+    {
+        feature_gate::emit_feature_err(&ecx.parse_sess,
+                                       "format_args_nl",
+                                       sp,
+                                       feature_gate::GateIssue::Language,
+                                       feature_gate::EXPLAIN_FORMAT_ARGS_NL);
+        return base::DummyResult::expr(sp);
+    }
     sp = sp.apply_mark(ecx.current_expansion.mark);
     match parse_args(ecx, sp, tts) {
         Some((efmt, args, names)) => {
-- 
cgit 1.4.1-3-g733a5