---

yaml
---
r: 234419
b: refs/heads/tmp
c: 5fbdf3c
h: refs/heads/master
i:
  234417: 2cd78e1
  234415: 19dc634
v: v3

Author: nrc

[refs]

@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/beta: d2e13e822a73e0ea46ae9e21afdd3155fc997f6d
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: d2a5b117c1933d16072e78bb9b58604984597fca
+refs/heads/tmp: 5fbdf3ccd0407533d7da95c2bd3c33944c71f1b0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: ab792abf1fcc28afbd315426213f6428da25c085
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/src/etc/featureck.py

@@ -47,24 +47,20 @@
                 is_feature_line = True
 
         if is_feature_line:
-            # turn `    ("foo", "1.0.0", Some(10), Active)` into
-            # `"foo", "1.0.0", Some(10), Active`
-            line = line.strip(' ,()')
+            line = line.replace("(", "").replace("),", "").replace(")", "")
             parts = line.split(",")
-            if len(parts) != 4:
+            if len(parts) != 3:
                 print("error: unexpected number of components in line: " + original_line)
                 sys.exit(1)
             feature_name = parts[0].strip().replace('"', "")
             since = parts[1].strip().replace('"', "")
-            issue = parts[2].strip()
-            status = parts[3].strip()
+            status = parts[2].strip()
             assert len(feature_name) > 0
             assert len(since) > 0
-            assert len(issue) > 0
             assert len(status) > 0
 
             language_feature_names += [feature_name]
-            language_features += [(feature_name, since, issue, status)]
+            language_features += [(feature_name, since, status)]
 
 assert len(language_features) > 0
 
@@ -162,7 +158,7 @@
     status = "unstable"
     stable_since = None
 
-    if f[3] == "Accepted":
+    if f[2] == "Accepted":
         status = "stable"
     if status == "stable":
         stable_since = f[1]

branches/tmp/src/librustc/middle/check_static_recursion.rs

@@ -18,7 +18,7 @@ use util::nodemap::NodeMap;
 
 use syntax::{ast};
 use syntax::codemap::Span;
-use syntax::feature_gate::{GateIssue, emit_feature_err};
+use syntax::feature_gate::emit_feature_err;
 use rustc_front::visit::Visitor;
 use rustc_front::visit;
 use rustc_front::hir;
@@ -143,7 +143,7 @@ impl<'a, 'ast: 'a> CheckItemRecursionVisitor<'a, 'ast> {
                 if !self.sess.features.borrow().static_recursion {
                     emit_feature_err(&self.sess.parse_sess.span_diagnostic,
                                      "static_recursion",
-                                     *self.root_span, GateIssue::Language, "recursive static");
+                                     *self.root_span, "recursive static");
                 }
             } else {
                 span_err!(self.sess, *self.root_span, E0265, "recursive constant");

branches/tmp/src/librustc/middle/stability.rs

@@ -22,7 +22,7 @@ use syntax::parse::token::InternedString;
 use syntax::codemap::{Span, DUMMY_SP};
 use syntax::ast;
 use syntax::ast::NodeId;
-use syntax::feature_gate::{GateIssue, emit_feature_err};
+use syntax::feature_gate::emit_feature_err;
 use util::nodemap::{DefIdMap, FnvHashSet, FnvHashMap};
 
 use rustc_front::hir;
@@ -294,14 +294,18 @@ impl<'a, 'tcx> Checker<'a, 'tcx> {
                 self.used_features.insert(feature.clone(), attr::Unstable);
 
                 if !self.active_features.contains(feature) {
-                    let msg = match *reason {
+                    let mut msg = match *reason {
                         Some(ref r) => format!("use of unstable library feature '{}': {}",
                                                &feature, &r),
                         None => format!("use of unstable library feature '{}'", &feature)
                     };
+                    if let Some(n) = issue {
+                        use std::fmt::Write;
+                        write!(&mut msg, " (see issue #{})", n).unwrap();
+                    }
 
                     emit_feature_err(&self.tcx.sess.parse_sess.span_diagnostic,
-                                      &feature, span, GateIssue::Library(issue), &msg);
+                                      &feature, span, &msg);
                 }
             }
             Some(&Stability { level, ref feature, .. }) => {

branches/tmp/src/librustc_typeck/astconv.rs

@@ -70,7 +70,7 @@ use util::nodemap::FnvHashSet;
 use std::slice;
 use syntax::{abi, ast};
 use syntax::codemap::{Span, Pos};
-use syntax::feature_gate::{GateIssue, emit_feature_err};
+use syntax::feature_gate::emit_feature_err;
 use syntax::parse::token;
 
 use rustc_front::print::pprust;
@@ -797,7 +797,7 @@ fn create_substs_for_ast_trait_ref<'a,'tcx>(this: &AstConv<'tcx>,
             // only with `Fn()` etc.
             if !this.tcx().sess.features.borrow().unboxed_closures && trait_def.paren_sugar {
                 emit_feature_err(&this.tcx().sess.parse_sess.span_diagnostic,
-                                 "unboxed_closures", span, GateIssue::Language,
+                                 "unboxed_closures", span,
                                  "\
                     the precise format of `Fn`-family traits' type parameters is \
                     subject to change. Use parenthetical notation (Fn(Foo, Bar) -> Baz) instead");
@@ -810,7 +810,7 @@ fn create_substs_for_ast_trait_ref<'a,'tcx>(this: &AstConv<'tcx>,
             // only with `Fn()` etc.
             if !this.tcx().sess.features.borrow().unboxed_closures && !trait_def.paren_sugar {
                 emit_feature_err(&this.tcx().sess.parse_sess.span_diagnostic,
-                                 "unboxed_closures", span, GateIssue::Language,
+                                 "unboxed_closures", span,
                                  "\
                     parenthetical notation is only stable when used with `Fn`-family traits");
             }

branches/tmp/src/libsyntax/ext/asm.rs

@@ -51,9 +51,7 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
                        -> Box<base::MacResult+'cx> {
     if !cx.ecfg.enable_asm() {
         feature_gate::emit_feature_err(
-            &cx.parse_sess.span_diagnostic, "asm", sp,
-            feature_gate::GateIssue::Language,
-            feature_gate::EXPLAIN_ASM);
+            &cx.parse_sess.span_diagnostic, "asm", sp, feature_gate::EXPLAIN_ASM);
         return DummyResult::expr(sp);
     }
 

branches/tmp/src/libsyntax/ext/concat_idents.rs

@@ -23,7 +23,6 @@ pub fn expand_syntax_ext<'cx>(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]
         feature_gate::emit_feature_err(&cx.parse_sess.span_diagnostic,
                                        "concat_idents",
                                        sp,
-                                       feature_gate::GateIssue::Language,
                                        feature_gate::EXPLAIN_CONCAT_IDENTS);
         return base::DummyResult::expr(sp);
     }

branches/tmp/src/libsyntax/ext/deriving/mod.rs

@@ -105,7 +105,6 @@ fn expand_derive(cx: &mut ExtCtxt,
                     feature_gate::emit_feature_err(&cx.parse_sess.span_diagnostic,
                                                    "custom_derive",
                                                    titem.span,
-                                                   feature_gate::GateIssue::Language,
                                                    feature_gate::EXPLAIN_CUSTOM_DERIVE);
                     continue;
                 }

branches/tmp/src/libsyntax/ext/expand.rs

@@ -778,7 +778,6 @@ pub fn expand_item_mac(it: P<ast::Item>,
                             &fld.cx.parse_sess.span_diagnostic,
                             "allow_internal_unstable",
                             it.span,
-                            feature_gate::GateIssue::Language,
                             feature_gate::EXPLAIN_ALLOW_INTERNAL_UNSTABLE)
                     }
 
@@ -1470,8 +1469,7 @@ pub fn expand_type(t: P<ast::Ty>, fld: &mut MacroExpander) -> P<ast::Ty> {
                     &fld.cx.parse_sess.span_diagnostic,
                     "type_macros",
                     t.span,
-                    feature_gate::GateIssue::Language,
-                    "type macros are experimental");
+                    "type macros are experimental (see issue: #27336)");
 
                 DummyResult::raw_ty(t.span)
             }

branches/tmp/src/libsyntax/ext/log_syntax.rs

@@ -22,7 +22,6 @@ pub fn expand_syntax_ext<'cx>(cx: &'cx mut base::ExtCtxt,
         feature_gate::emit_feature_err(&cx.parse_sess.span_diagnostic,
                                        "log_syntax",
                                        sp,
-                                       feature_gate::GateIssue::Language,
                                        feature_gate::EXPLAIN_LOG_SYNTAX);
         return base::DummyResult::any(sp);
     }

branches/tmp/src/libsyntax/ext/trace_macros.rs

@@ -24,7 +24,6 @@ pub fn expand_trace_macros(cx: &mut ExtCtxt,
         feature_gate::emit_feature_err(&cx.parse_sess.span_diagnostic,
                                        "trace_macros",
                                        sp,
-                                       feature_gate::GateIssue::Language,
                                        feature_gate::EXPLAIN_TRACE_MACROS);
         return base::DummyResult::any(sp);
     }