From 4a99a9de034d27eabad833a6bf0904dcaab34dc7 Mon Sep 17 00:00:00 2001
From: ShyamSundarB <shyambaskaran@outlook.com>
Date: Mon, 8 Aug 2016 00:12:53 +0530
Subject: [PATCH 01/12] E0248 Change in issue format

---
 src/test/compile-fail/E0248.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/compile-fail/E0248.rs b/src/test/compile-fail/E0248.rs
index fdfd41a456bf6..25568a323e161 100644
--- a/src/test/compile-fail/E0248.rs
+++ b/src/test/compile-fail/E0248.rs
@@ -13,6 +13,6 @@ enum Foo {
 }
 
 fn do_something(x: Foo::Bar) { } //~ ERROR E0248
-
+                //~| NOTE value used as a type
 fn main() {
 }

From a848f11007e7cd44f816acb8128247d5d7a1359e Mon Sep 17 00:00:00 2001
From: ShyamSundarB <shyambaskaran@outlook.com>
Date: Mon, 8 Aug 2016 00:15:36 +0530
Subject: [PATCH 02/12] E0248 Change in issue format

---
 src/librustc_typeck/astconv.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs
index 50ffa52e88ba4..deba31db5dfcf 100644
--- a/src/librustc_typeck/astconv.rs
+++ b/src/librustc_typeck/astconv.rs
@@ -1582,9 +1582,11 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o {
                 return self.tcx().types.err;
             }
             _ => {
-                span_err!(tcx.sess, span, E0248,
-                          "found value `{}` used as a type",
-                          tcx.item_path_str(def.def_id()));
+                struct_span_err!(tcx.sess, span, E0248,
+                           "found value `{}` used as a type",
+                            tcx.item_path_str(def.def_id()))
+                           .span_label(span, &format!("value used as a type"))
+                           .emit();
                 return self.tcx().types.err;
             }
         }

From 2d616429617488106fc3c99a8fd2982b937779dd Mon Sep 17 00:00:00 2001
From: ShyamSundarB <shyambaskaran@outlook.com>
Date: Tue, 9 Aug 2016 15:16:59 +0530
Subject: [PATCH 03/12] E0267 UT New Format

---
 src/test/compile-fail/E0267.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/compile-fail/E0267.rs b/src/test/compile-fail/E0267.rs
index 6287256e866c9..b58fbce8bc648 100644
--- a/src/test/compile-fail/E0267.rs
+++ b/src/test/compile-fail/E0267.rs
@@ -10,4 +10,5 @@
 
 fn main() {
     let w = || { break; }; //~ ERROR E0267
+            //~| NOTE cannot break inside of a closure
 }

From 4682a2943ef606e19f02a202dde927905b2ea4b6 Mon Sep 17 00:00:00 2001
From: ShyamSundarB <shyambaskaran@outlook.com>
Date: Tue, 9 Aug 2016 15:17:34 +0530
Subject: [PATCH 04/12] E0268 UT New Format

---
 src/test/compile-fail/E0268.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/compile-fail/E0268.rs b/src/test/compile-fail/E0268.rs
index 41e88e2f492a9..3313e07667a1c 100644
--- a/src/test/compile-fail/E0268.rs
+++ b/src/test/compile-fail/E0268.rs
@@ -10,4 +10,5 @@
 
 fn main() {
     break; //~ ERROR E0268
+    //~| NOTE cannot break outside of a loop
 }

From afd01f0310a4aaa48974e1d0764bc6614ad27a71 Mon Sep 17 00:00:00 2001
From: ShyamSundarB <shyambaskaran@outlook.com>
Date: Tue, 9 Aug 2016 15:19:59 +0530
Subject: [PATCH 05/12] E0267 & E0268 New Error Format

---
 src/librustc_passes/loops.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/librustc_passes/loops.rs b/src/librustc_passes/loops.rs
index 4e251793f6917..eab16bd5bd1b5 100644
--- a/src/librustc_passes/loops.rs
+++ b/src/librustc_passes/loops.rs
@@ -77,10 +77,14 @@ impl<'a> CheckLoopVisitor<'a> {
         match self.cx {
             Loop => {}
             Closure => {
-                span_err!(self.sess, span, E0267, "`{}` inside of a closure", name);
+                struct_span_err!(self.sess, span, E0267, "`{}` inside of a closure", name)
+                .span_label(span, &format!("cannot break inside of a closure"))
+                .emit();
             }
             Normal => {
-                span_err!(self.sess, span, E0268, "`{}` outside of loop", name);
+                struct_span_err!(self.sess, span, E0268, "`{}` outside of loop", name)
+                .span_label(span, &format!("cannot break outside of a loop"))
+                .emit();
             }
         }
     }

From 1a6fac7ed24b52571ea4b20b440b0acb6e0d8992 Mon Sep 17 00:00:00 2001
From: ShyamSundarB <shyambaskaran@outlook.com>
Date: Mon, 8 Aug 2016 00:12:53 +0530
Subject: [PATCH 06/12] E0248 Change in issue format

E0248 Change in issue format

E0267 UT New Format

E0268 UT New Format

E0267 & E0268 New Error Format
---
 src/librustc_passes/loops.rs   | 8 ++++++--
 src/librustc_typeck/astconv.rs | 8 +++++---
 src/test/compile-fail/E0248.rs | 2 +-
 src/test/compile-fail/E0267.rs | 1 +
 src/test/compile-fail/E0268.rs | 1 +
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/librustc_passes/loops.rs b/src/librustc_passes/loops.rs
index 4e251793f6917..eab16bd5bd1b5 100644
--- a/src/librustc_passes/loops.rs
+++ b/src/librustc_passes/loops.rs
@@ -77,10 +77,14 @@ impl<'a> CheckLoopVisitor<'a> {
         match self.cx {
             Loop => {}
             Closure => {
-                span_err!(self.sess, span, E0267, "`{}` inside of a closure", name);
+                struct_span_err!(self.sess, span, E0267, "`{}` inside of a closure", name)
+                .span_label(span, &format!("cannot break inside of a closure"))
+                .emit();
             }
             Normal => {
-                span_err!(self.sess, span, E0268, "`{}` outside of loop", name);
+                struct_span_err!(self.sess, span, E0268, "`{}` outside of loop", name)
+                .span_label(span, &format!("cannot break outside of a loop"))
+                .emit();
             }
         }
     }
diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs
index 50ffa52e88ba4..deba31db5dfcf 100644
--- a/src/librustc_typeck/astconv.rs
+++ b/src/librustc_typeck/astconv.rs
@@ -1582,9 +1582,11 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o {
                 return self.tcx().types.err;
             }
             _ => {
-                span_err!(tcx.sess, span, E0248,
-                          "found value `{}` used as a type",
-                          tcx.item_path_str(def.def_id()));
+                struct_span_err!(tcx.sess, span, E0248,
+                           "found value `{}` used as a type",
+                            tcx.item_path_str(def.def_id()))
+                           .span_label(span, &format!("value used as a type"))
+                           .emit();
                 return self.tcx().types.err;
             }
         }
diff --git a/src/test/compile-fail/E0248.rs b/src/test/compile-fail/E0248.rs
index fdfd41a456bf6..25568a323e161 100644
--- a/src/test/compile-fail/E0248.rs
+++ b/src/test/compile-fail/E0248.rs
@@ -13,6 +13,6 @@ enum Foo {
 }
 
 fn do_something(x: Foo::Bar) { } //~ ERROR E0248
-
+                //~| NOTE value used as a type
 fn main() {
 }
diff --git a/src/test/compile-fail/E0267.rs b/src/test/compile-fail/E0267.rs
index 6287256e866c9..b58fbce8bc648 100644
--- a/src/test/compile-fail/E0267.rs
+++ b/src/test/compile-fail/E0267.rs
@@ -10,4 +10,5 @@
 
 fn main() {
     let w = || { break; }; //~ ERROR E0267
+            //~| NOTE cannot break inside of a closure
 }
diff --git a/src/test/compile-fail/E0268.rs b/src/test/compile-fail/E0268.rs
index 41e88e2f492a9..3313e07667a1c 100644
--- a/src/test/compile-fail/E0268.rs
+++ b/src/test/compile-fail/E0268.rs
@@ -10,4 +10,5 @@
 
 fn main() {
     break; //~ ERROR E0268
+    //~| NOTE cannot break outside of a loop
 }

From cf345073c1c7ac211174b8e196f56e49b5826fa6 Mon Sep 17 00:00:00 2001
From: ShyamSundarB <shyambaskaran@outlook.com>
Date: Tue, 9 Aug 2016 15:19:59 +0530
Subject: [PATCH 07/12] Revert "E0267 & E0268 New Error Format"

This reverts commit afd01f0310a4aaa48974e1d0764bc6614ad27a71.
---
 src/librustc_passes/loops.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/librustc_passes/loops.rs b/src/librustc_passes/loops.rs
index eab16bd5bd1b5..4e251793f6917 100644
--- a/src/librustc_passes/loops.rs
+++ b/src/librustc_passes/loops.rs
@@ -77,14 +77,10 @@ impl<'a> CheckLoopVisitor<'a> {
         match self.cx {
             Loop => {}
             Closure => {
-                struct_span_err!(self.sess, span, E0267, "`{}` inside of a closure", name)
-                .span_label(span, &format!("cannot break inside of a closure"))
-                .emit();
+                span_err!(self.sess, span, E0267, "`{}` inside of a closure", name);
             }
             Normal => {
-                struct_span_err!(self.sess, span, E0268, "`{}` outside of loop", name)
-                .span_label(span, &format!("cannot break outside of a loop"))
-                .emit();
+                span_err!(self.sess, span, E0268, "`{}` outside of loop", name);
             }
         }
     }

From cb786ebb5abf7d32f8e150cf5eebaa654c45b794 Mon Sep 17 00:00:00 2001
From: ShyamSundarB <shyambaskaran@outlook.com>
Date: Tue, 9 Aug 2016 15:17:34 +0530
Subject: [PATCH 08/12] Revert "E0268 UT New Format"

This reverts commit 4682a2943ef606e19f02a202dde927905b2ea4b6.
---
 src/test/compile-fail/E0268.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/compile-fail/E0268.rs b/src/test/compile-fail/E0268.rs
index 3313e07667a1c..41e88e2f492a9 100644
--- a/src/test/compile-fail/E0268.rs
+++ b/src/test/compile-fail/E0268.rs
@@ -10,5 +10,4 @@
 
 fn main() {
     break; //~ ERROR E0268
-    //~| NOTE cannot break outside of a loop
 }

From d62749a0b2ba3166d4c75e32e50801c39c5fcc5f Mon Sep 17 00:00:00 2001
From: ShyamSundarB <shyambaskaran@outlook.com>
Date: Tue, 9 Aug 2016 15:16:59 +0530
Subject: [PATCH 09/12] Revert "E0267 UT New Format"

This reverts commit 2d616429617488106fc3c99a8fd2982b937779dd.
---
 src/test/compile-fail/E0267.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/compile-fail/E0267.rs b/src/test/compile-fail/E0267.rs
index b58fbce8bc648..6287256e866c9 100644
--- a/src/test/compile-fail/E0267.rs
+++ b/src/test/compile-fail/E0267.rs
@@ -10,5 +10,4 @@
 
 fn main() {
     let w = || { break; }; //~ ERROR E0267
-            //~| NOTE cannot break inside of a closure
 }

From 9a3c119656db1248df9b93b97a41f680d5445cfd Mon Sep 17 00:00:00 2001
From: ShyamSundarB <shyambaskaran@outlook.com>
Date: Mon, 8 Aug 2016 00:15:36 +0530
Subject: [PATCH 10/12] Revert "E0248 Change in issue format"

This reverts commit a848f11007e7cd44f816acb8128247d5d7a1359e.
---
 src/librustc_typeck/astconv.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs
index deba31db5dfcf..50ffa52e88ba4 100644
--- a/src/librustc_typeck/astconv.rs
+++ b/src/librustc_typeck/astconv.rs
@@ -1582,11 +1582,9 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o {
                 return self.tcx().types.err;
             }
             _ => {
-                struct_span_err!(tcx.sess, span, E0248,
-                           "found value `{}` used as a type",
-                            tcx.item_path_str(def.def_id()))
-                           .span_label(span, &format!("value used as a type"))
-                           .emit();
+                span_err!(tcx.sess, span, E0248,
+                          "found value `{}` used as a type",
+                          tcx.item_path_str(def.def_id()));
                 return self.tcx().types.err;
             }
         }

From 6ac944ecd4288a620bfec83393eccb5301ca43ae Mon Sep 17 00:00:00 2001
From: ShyamSundarB <shyambaskaran@outlook.com>
Date: Mon, 8 Aug 2016 00:12:53 +0530
Subject: [PATCH 11/12] Revert "E0248 Change in issue format"

This reverts commit 4a99a9de034d27eabad833a6bf0904dcaab34dc7.
---
 src/test/compile-fail/E0248.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/compile-fail/E0248.rs b/src/test/compile-fail/E0248.rs
index 25568a323e161..fdfd41a456bf6 100644
--- a/src/test/compile-fail/E0248.rs
+++ b/src/test/compile-fail/E0248.rs
@@ -13,6 +13,6 @@ enum Foo {
 }
 
 fn do_something(x: Foo::Bar) { } //~ ERROR E0248
-                //~| NOTE value used as a type
+
 fn main() {
 }

From b0f5f9bacd60f3f302aa05162b082a3c3cf70042 Mon Sep 17 00:00:00 2001
From: ShyamSundarB <shyambaskaran@outlook.com>
Date: Mon, 8 Aug 2016 00:12:53 +0530
Subject: [PATCH 12/12] E0248 Change in issue format

E0248 Change in issue format

E0267 UT New Format

E0268 UT New Format

E0267 & E0268 New Error Format
---
 src/librustc_passes/loops.rs   | 8 ++++++--
 src/librustc_typeck/astconv.rs | 8 +++++---
 src/test/compile-fail/E0248.rs | 2 +-
 src/test/compile-fail/E0267.rs | 1 +
 src/test/compile-fail/E0268.rs | 1 +
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/librustc_passes/loops.rs b/src/librustc_passes/loops.rs
index 4e251793f6917..eab16bd5bd1b5 100644
--- a/src/librustc_passes/loops.rs
+++ b/src/librustc_passes/loops.rs
@@ -77,10 +77,14 @@ impl<'a> CheckLoopVisitor<'a> {
         match self.cx {
             Loop => {}
             Closure => {
-                span_err!(self.sess, span, E0267, "`{}` inside of a closure", name);
+                struct_span_err!(self.sess, span, E0267, "`{}` inside of a closure", name)
+                .span_label(span, &format!("cannot break inside of a closure"))
+                .emit();
             }
             Normal => {
-                span_err!(self.sess, span, E0268, "`{}` outside of loop", name);
+                struct_span_err!(self.sess, span, E0268, "`{}` outside of loop", name)
+                .span_label(span, &format!("cannot break outside of a loop"))
+                .emit();
             }
         }
     }
diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs
index 50ffa52e88ba4..deba31db5dfcf 100644
--- a/src/librustc_typeck/astconv.rs
+++ b/src/librustc_typeck/astconv.rs
@@ -1582,9 +1582,11 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o {
                 return self.tcx().types.err;
             }
             _ => {
-                span_err!(tcx.sess, span, E0248,
-                          "found value `{}` used as a type",
-                          tcx.item_path_str(def.def_id()));
+                struct_span_err!(tcx.sess, span, E0248,
+                           "found value `{}` used as a type",
+                            tcx.item_path_str(def.def_id()))
+                           .span_label(span, &format!("value used as a type"))
+                           .emit();
                 return self.tcx().types.err;
             }
         }
diff --git a/src/test/compile-fail/E0248.rs b/src/test/compile-fail/E0248.rs
index fdfd41a456bf6..25568a323e161 100644
--- a/src/test/compile-fail/E0248.rs
+++ b/src/test/compile-fail/E0248.rs
@@ -13,6 +13,6 @@ enum Foo {
 }
 
 fn do_something(x: Foo::Bar) { } //~ ERROR E0248
-
+                //~| NOTE value used as a type
 fn main() {
 }
diff --git a/src/test/compile-fail/E0267.rs b/src/test/compile-fail/E0267.rs
index 6287256e866c9..b58fbce8bc648 100644
--- a/src/test/compile-fail/E0267.rs
+++ b/src/test/compile-fail/E0267.rs
@@ -10,4 +10,5 @@
 
 fn main() {
     let w = || { break; }; //~ ERROR E0267
+            //~| NOTE cannot break inside of a closure
 }
diff --git a/src/test/compile-fail/E0268.rs b/src/test/compile-fail/E0268.rs
index 41e88e2f492a9..3313e07667a1c 100644
--- a/src/test/compile-fail/E0268.rs
+++ b/src/test/compile-fail/E0268.rs
@@ -10,4 +10,5 @@
 
 fn main() {
     break; //~ ERROR E0268
+    //~| NOTE cannot break outside of a loop
 }