From 259379426cebf2c66e67076e6214b9e3e8c920df Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Fri, 8 Jan 2016 17:53:44 -0500
Subject: Revamp the "future incompatible" section to clarify the situation
 better

---
 src/libsyntax/errors/mod.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/libsyntax/errors')

diff --git a/src/libsyntax/errors/mod.rs b/src/libsyntax/errors/mod.rs
index a2fae975148..16e5f06c07c 100644
--- a/src/libsyntax/errors/mod.rs
+++ b/src/libsyntax/errors/mod.rs
@@ -160,6 +160,17 @@ impl<'a> DiagnosticBuilder<'a> {
         self.sub(Level::Note, msg, Some(sp), None);
         self
     }
+    pub fn warn(&mut self, msg: &str) -> &mut DiagnosticBuilder<'a>  {
+        self.sub(Level::Warning, msg, None, None);
+        self
+    }
+    pub fn span_warn(&mut self,
+                     sp: Span,
+                     msg: &str)
+                     -> &mut DiagnosticBuilder<'a> {
+        self.sub(Level::Warning, msg, Some(sp), None);
+        self
+    }
     pub fn help(&mut self , msg: &str) -> &mut DiagnosticBuilder<'a>  {
         self.sub(Level::Help, msg, None, None);
         self
-- 
cgit 1.4.1-3-g733a5


From 0254f69d745058a6f293639b4c47de02062694b2 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Tue, 12 Jan 2016 19:38:12 -0500
Subject: use fileline_ and not full span_ for the followon messages

---
 src/librustc/lint/context.rs | 4 ++--
 src/libsyntax/errors/mod.rs  | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/libsyntax/errors')

diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs
index dca83dadec1..2fc2448dd0c 100644
--- a/src/librustc/lint/context.rs
+++ b/src/librustc/lint/context.rs
@@ -451,8 +451,8 @@ pub fn raw_struct_lint<'a>(sess: &'a Session,
         let citation = format!("for more information, see {}",
                                future_incompatible.reference);
         if let Some(sp) = span {
-            err.span_warn(sp, &explanation);
-            err.span_note(sp, &citation);
+            err.fileline_warn(sp, &explanation);
+            err.fileline_note(sp, &citation);
         } else {
             err.warn(&explanation);
             err.note(&citation);
diff --git a/src/libsyntax/errors/mod.rs b/src/libsyntax/errors/mod.rs
index 16e5f06c07c..05398d10a94 100644
--- a/src/libsyntax/errors/mod.rs
+++ b/src/libsyntax/errors/mod.rs
@@ -200,6 +200,13 @@ impl<'a> DiagnosticBuilder<'a> {
         self.sub(Level::Note, msg, Some(sp), Some(EndSpan(sp)));
         self
     }
+    pub fn fileline_warn(&mut self ,
+                         sp: Span,
+                         msg: &str)
+                         -> &mut DiagnosticBuilder<'a>  {
+        self.sub(Level::Warning, msg, Some(sp), Some(FileLine(sp)));
+        self
+    }
     pub fn fileline_note(&mut self ,
                          sp: Span,
                          msg: &str)
-- 
cgit 1.4.1-3-g733a5