improve diagnostic for raw pointer field access with ->

Author: Kivooeo

compiler/rustc_hir_typeck/src/expr.rs

@@ -3278,6 +3278,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
     }
 
     fn suggest_first_deref_field(&self, err: &mut Diag<'_>, base: &hir::Expr<'_>, field: Ident) {
+<<<<<<< HEAD
         err.span_label(field.span, "unknown field");
         let val = if let Ok(base) = self.tcx.sess.source_map().span_to_snippet(base.span)
             && base.len() < 20
@@ -3293,6 +3294,26 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 (base.span.to(field.span.shrink_to_lo()), format!("{val}).")),
             ],
             Applicability::MaybeIncorrect,
+=======
+        let full_span = base.span.to(field.span);
+
+        let base_snippet = self
+            .tcx
+            .sess
+            .source_map()
+            .span_to_snippet(base.span)
+            .unwrap_or_else(|_| "ptr".to_string());
+
+        let replacement = format!("(*{}).{}", base_snippet, field.name);
+
+        err.span_label(full_span, "unknown field access via raw pointer");
+
+        err.span_suggestion_verbose(
+            full_span,
+            "`->` is not valid in Rust; use `.` on a dereferenced raw pointer instead",
+            replacement,
+            Applicability::MachineApplicable,
+>>>>>>> cf551dbca4b (improve diagnostic for raw pointer field access with ->)
         );
     }