Rollup merge of rust-lang#35291 - yossi-k:master, r=jonathandturner

Update E0079 to new format

Fixes rust-lang#35222. Part of rust-lang#35233.
r? @GuillaumeGomez

Author: Jonathan Turner

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();
         };
 

src/test/compile-fail/E0079.rs

@@ -10,6 +10,7 @@
 
 enum Foo {
     Q = "32" //~ ERROR E0079
+    //~^ expected 'isize' type
 }
 
 fn main() {