about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2016-08-14 20:29:49 +0300
committerGitHub <noreply@github.com>2016-08-14 20:29:49 +0300
commitb65ff08d4675c798cedc86d0df302ecba2740bfa (patch)
tree50f26eb1ed56acf768b5892927816928a6005fd8 /src
parentda2328b0b1e13fc4d8f7c813f47365710edfc10e (diff)
parent1a6fac7ed24b52571ea4b20b440b0acb6e0d8992 (diff)
downloadrust-b65ff08d4675c798cedc86d0df302ecba2740bfa.tar.gz
rust-b65ff08d4675c798cedc86d0df302ecba2740bfa.zip
Rollup merge of #35586 - shyaamsundhar:SqushCom, r=jonathandturner
E0248, E0267 & E0268 Change into issue format

r? @jonathandturner  Part of #35391, #35519 and #35520. I have squashed all changes into a single commit. Please review the changes.

E0248 Change in issue format

E0267 UT New Format

E0268 UT New Format

E0267 & E0268 New Error Format
Diffstat (limited to 'src')
-rw-r--r--src/librustc_passes/loops.rs8
-rw-r--r--src/test/compile-fail/E0267.rs1
-rw-r--r--src/test/compile-fail/E0268.rs1
3 files changed, 8 insertions, 2 deletions
diff --git a/src/librustc_passes/loops.rs b/src/librustc_passes/loops.rs
index 4e251793f69..eab16bd5bd1 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/test/compile-fail/E0267.rs b/src/test/compile-fail/E0267.rs
index 6287256e866..b58fbce8bc6 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 41e88e2f492..3313e07667a 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
 }