improve visibility of future-incompatibilities (mildly, at least)

Author: nikomatsakis

src/librustc/lint/builtin.rs

@@ -16,6 +16,9 @@
 
 use lint::{LintPass, LateLintPass, LintArray};
 
+// name of the future-incompatible group
+pub const FUTURE_INCOMPATIBLE: &'static str = "future_incompatible";
+
 declare_lint! {
     pub CONST_ERR,
     Warn,

src/librustc/lint/context.rs

@@ -363,8 +363,12 @@ pub fn gather_attrs(attrs: &[ast::Attribute])
 /// in trans that run after the main lint pass is finished. Most
 /// lints elsewhere in the compiler should call
 /// `Session::add_lint()` instead.
-pub fn raw_emit_lint(sess: &Session, lint: &'static Lint,
-                     lvlsrc: LevelSource, span: Option<Span>, msg: &str) {
+pub fn raw_emit_lint(sess: &Session,
+                     lints: &LintStore,
+                     lint: &'static Lint,
+                     lvlsrc: LevelSource,
+                     span: Option<Span>,
+                     msg: &str) {
     let (mut level, source) = lvlsrc;
     if level == Allow { return }
 
@@ -399,6 +403,18 @@ pub fn raw_emit_lint(sess: &Session, lint: &'static Lint,
         _ => sess.bug("impossible level in raw_emit_lint"),
     }
 
+    // Check for future incompatibility lints and issue a stronger warning.
+    let future_incompat_lints = &lints.lint_groups[builtin::FUTURE_INCOMPATIBLE];
+    let this_id = LintId::of(lint);
+    if future_incompat_lints.0.iter().any(|&id| id == this_id) {
+        let msg = "this lint will become a HARD ERROR in a future release!";
+        if let Some(sp) = span {
+            sess.span_note(sp, msg);
+        } else {
+            sess.note(msg);
+        }
+    }
+
     if let Some(span) = def {
         sess.span_note(span, "lint level defined here");
     }
@@ -428,7 +444,7 @@ pub trait LintContext: Sized {
             Some(&pair) => pair,
         };
 
-        raw_emit_lint(&self.sess(), lint, (level, src), span, msg);
+        raw_emit_lint(&self.sess(), self.lints(), lint, (level, src), span, msg);
     }
 
     /// Emit a lint at the appropriate level, for a particular span.

src/librustc_trans/trans/base.rs

@@ -2204,6 +2204,7 @@ fn enum_variant_size_lint(ccx: &CrateContext, enum_def: &hir::EnumDef, sp: Span,
         // Use lint::raw_emit_lint rather than sess.add_lint because the lint-printing
         // pass for the latter already ran.
         lint::raw_emit_lint(&ccx.tcx().sess,
+                            &ccx.tcx().sess.lint_store.borrow(),
                             lint::builtin::VARIANT_SIZE_DIFFERENCES,
                             *lvlsrc.unwrap(),
                             Some(sp),