Update E0079 to new format

diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
index 4486748a1f0564fbc9bf6c873d26be741c7edec9..d59f07f6c5d69ef91d64fd79a04185fbb88b656d 100644 (file)
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@@ -1057,6 +1057,7 @@ fn evaluate_disr_expr(ccx: &CrateCtxt, repr_ty: attr::IntType, e: &hir::Expr)
         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 23957c72ff00eadd4ab402b8c0717bb947b11eb4..c9b7f549d5aaaea6cf029292716f1541c9b0d31d 100644 (file)
--- 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() {