about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYossi Konstantinovsky <yossi@nuvo-group.com>2016-08-04 16:19:52 +0300
committerYossi Konstantinovsky <yossi@nuvo-group.com>2016-08-04 16:23:24 +0300
commit7fc0b2f3e29e9d2d4bcdbd82864864da21ddee8c (patch)
treef1202b84be5f878061671a852becec87d853031d
parent271d048523b6c1b0e773d9e5cc76bbb997cc180c (diff)
downloadrust-7fc0b2f3e29e9d2d4bcdbd82864864da21ddee8c.tar.gz
rust-7fc0b2f3e29e9d2d4bcdbd82864864da21ddee8c.zip
Update E0079 to new format
-rw-r--r--src/librustc_typeck/collect.rs1
-rw-r--r--src/test/compile-fail/E0079.rs1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
index 4486748a1f0..d59f07f6c5d 100644
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@@ -1057,6 +1057,7 @@ fn convert_struct_def<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,
         let print_err = |cv: ConstVal| {
             struct_span_err!(ccx.tcx.sess, e.span, E0079, "mismatched types")
                 .note_expected_found(&"type", &ty_hint, &format!("{}", cv.description()))
+                .span_label(e.span, &format!("expected '{}' type", ty_hint))
                 .emit();
         };
 
diff --git a/src/test/compile-fail/E0079.rs b/src/test/compile-fail/E0079.rs
index 23957c72ff0..c9b7f549d5a 100644
--- a/src/test/compile-fail/E0079.rs
+++ b/src/test/compile-fail/E0079.rs
@@ -10,6 +10,7 @@
 
 enum Foo {
     Q = "32" //~ ERROR E0079
+    //~^ expected 'isize' type
 }
 
 fn main() {