Generated new .stderr files

Author: Kivooeo

compiler/rustc_hir_typeck/src/expr.rs

@@ -3278,7 +3278,6 @@ 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
@@ -3294,26 +3293,6 @@ 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 ->)
         );
     }
 

tests/ui/issues/issue-11004.stderr

@@ -2,23 +2,29 @@ error[E0609]: no field `x` on type `*mut A`
   --> $DIR/issue-11004.rs:7:21
    |
 LL |     let x : i32 = n.x;
-   |                     ^ unknown field
+   |                   --^
+   |                   |
+   |                   unknown field access via raw pointer
    |
-help: `n` is a raw pointer; try dereferencing it
+help: use `.` on a dereferenced raw pointer instead
+   |
+LL -     let x : i32 = n.x;
+LL +     let x : i32 = (*n).x;
    |
-LL |     let x : i32 = (*n).x;
-   |                   ++ +
 
 error[E0609]: no field `y` on type `*mut A`
   --> $DIR/issue-11004.rs:8:21
    |
 LL |     let y : f64 = n.y;
-   |                     ^ unknown field
+   |                   --^
+   |                   |
+   |                   unknown field access via raw pointer
+   |
+help: use `.` on a dereferenced raw pointer instead
    |
-help: `n` is a raw pointer; try dereferencing it
+LL -     let y : f64 = n.y;
+LL +     let y : f64 = (*n).y;
    |
-LL |     let y : f64 = (*n).y;
-   |                   ++ +
 
 error: aborting due to 2 previous errors
 

tests/ui/suggestions/parenthesized-deref-suggestion.stderr

@@ -2,7 +2,9 @@ error[E0609]: no field `opts` on type `*const Session`
   --> $DIR/parenthesized-deref-suggestion.rs:7:30
    |
 LL |     (sess as *const Session).opts;
-   |                              ^^^^ unknown field
+   |     -------------------------^^^^
+   |     |
+   |     unknown field access via raw pointer
    |
 help: `the value` is a raw pointer; try dereferencing it
    |

tests/ui/unsafe/unsafe-fn-autoderef.stderr

@@ -2,12 +2,15 @@ error[E0609]: no field `f` on type `*const Rec`
   --> $DIR/unsafe-fn-autoderef.rs:19:14
    |
 LL |     return p.f;
-   |              ^ unknown field
+   |            --^
+   |            |
+   |            unknown field access via raw pointer
    |
-help: `p` is a raw pointer; try dereferencing it
+help: use `.` on a dereferenced raw pointer instead
+   |
+LL -     return p.f;
+LL +     return (*p).f;
    |
-LL |     return (*p).f;
-   |            ++ +
 
 error: aborting due to 1 previous error