Rollup merge of rust-lang#35526 - munyari:e0033, r=jonathandturner

Update E0033 to the new error format

Part of rust-lang#35233

Addresses rust-lang#35498
"r? @jonathandturner

Author: eddyb

src/librustc_typeck/check/_match.rs

@@ -347,9 +347,11 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
                 if let ty::TyTrait(..) = mt.ty.sty {
                     // This is "x = SomeTrait" being reduced from
                     // "let &x = &SomeTrait" or "let box x = Box<SomeTrait>", an error.
-                    span_err!(self.tcx.sess, span, E0033,
-                              "type `{}` cannot be dereferenced",
-                              self.ty_to_string(expected));
+                    let type_str = self.ty_to_string(expected);
+                    struct_span_err!(self.tcx.sess, span, E0033,
+                              "type `{}` cannot be dereferenced", type_str)
+                        .span_label(span, &format!("type `{}` cannot be dereferenced", type_str))
+                        .emit();
                     return false
                 }
             }

src/test/compile-fail/E0033.rs

@@ -15,5 +15,10 @@ trait SomeTrait {
 fn main() {
     let trait_obj: &SomeTrait = SomeTrait; //~ ERROR E0425
                                            //~^ ERROR E0038
-    let &invalid = trait_obj; //~ ERROR E0033
+                                           //~| method `foo` has no receiver
+                                           //~| NOTE the trait `SomeTrait` cannot be made into an object
+
+    let &invalid = trait_obj;
+    //~^ ERROR E0033
+    //~| NOTE type `&SomeTrait` cannot be dereferenced
 }