improve diagnostic for raw pointer field access using ->

Author: Kivooeo

Diff for: compiler/rustc_hir_typeck/src/expr.rs

@@ -3289,8 +3289,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         err.multipart_suggestion(
             format!("{val} is a raw pointer; try dereferencing it"),
             vec![
-                (base.span.shrink_to_lo(), "(*".to_string()),
-                (base.span.shrink_to_hi(), ")".to_string()),
+                (base.span.shrink_to_lo(), "(*".into()),
+                (base.span.between(field.span), format!(").")),
             ],
             Applicability::MaybeIncorrect,
         );

Diff for: compiler/rustc_parse/messages.ftl

@@ -246,9 +246,9 @@ parse_expected_struct_field = expected one of `,`, `:`, or `{"}"}`, found `{$tok
 
 parse_expected_trait_in_trait_impl_found_type = expected a trait, found type
 
-parse_expr_rarrow_call = `->` used for field access or method call
+parse_expr_rarrow_call = `->` is not valid for field access or method call
     .suggestion = try using `.` instead
-    .help = the `.` operator will dereference the value if needed
+    .help = the `.` operator will automatically dereference the value, except if the value is a raw pointer
 
 parse_extern_crate_name_with_dashes = crate name using dashes are not valid in `extern crate` statements
     .label = dash-separated idents are not valid

Diff for: compiler/rustc_parse/src/errors.rs

@@ -3333,7 +3333,6 @@ pub(crate) struct AsyncImpl {
 #[help]
 pub(crate) struct ExprRArrowCall {
     #[primary_span]
-    #[suggestion(style = "verbose", applicability = "machine-applicable", code = ".")]
     pub span: Span,
 }
 

Diff for: tests/ui/parser/expr-rarrow-call-on-a-raw-pointer.fixed

@@ -0,0 +1,23 @@
+//@ run-rustfix
+#![allow(
+    dead_code,
+    unused_must_use
+)]
+
+struct Named {
+    foo: usize,
+}
+
+struct Unnamed(usize);
+
+unsafe fn named_struct_field_access(named: *mut Named) {
+    (*named).foo += 1; //~ ERROR `->` is not valid for field access or method call
+    //~^ ERROR no field `foo` on type `*mut Named`
+}
+
+unsafe fn unnamed_struct_field_access(unnamed: *mut Unnamed) {
+    (*unnamed).0 += 1; //~ ERROR `->` is not valid for field access or method call
+    //~^ ERROR no field `0` on type `*mut Unnamed`
+}
+
+fn main() {}

Diff for: tests/ui/parser/expr-rarrow-call-on-a-raw-pointer.rs

@@ -0,0 +1,23 @@
+//@ run-rustfix
+#![allow(
+    dead_code,
+    unused_must_use
+)]
+
+struct Named {
+    foo: usize,
+}
+
+struct Unnamed(usize);
+
+unsafe fn named_struct_field_access(named: *mut Named) {
+    named->foo += 1; //~ ERROR `->` is not valid for field access or method call
+    //~^ ERROR no field `foo` on type `*mut Named`
+}
+
+unsafe fn unnamed_struct_field_access(unnamed: *mut Unnamed) {
+    unnamed->0 += 1; //~ ERROR `->` is not valid for field access or method call
+    //~^ ERROR no field `0` on type `*mut Unnamed`
+}
+
+fn main() {}

Diff for: tests/ui/parser/expr-rarrow-call-on-a-raw-pointer.stderr

@@ -0,0 +1,43 @@
+error: `->` is not valid for field access or method call
+  --> $DIR/expr-rarrow-call-on-a-raw-pointer.rs:14:10
+   |
+LL |     named->foo += 1;
+   |          ^^
+   |
+   = help: the `.` operator will automatically dereference the value, except if the value is a raw pointer
+
+error: `->` is not valid for field access or method call
+  --> $DIR/expr-rarrow-call-on-a-raw-pointer.rs:19:12
+   |
+LL |     unnamed->0 += 1;
+   |            ^^
+   |
+   = help: the `.` operator will automatically dereference the value, except if the value is a raw pointer
+
+error[E0609]: no field `foo` on type `*mut Named`
+  --> $DIR/expr-rarrow-call-on-a-raw-pointer.rs:14:12
+   |
+LL |     named->foo += 1;
+   |            ^^^ unknown field
+   |
+help: `named` is a raw pointer; try dereferencing it
+   |
+LL -     named->foo += 1;
+LL +     (*named).foo += 1;
+   |
+
+error[E0609]: no field `0` on type `*mut Unnamed`
+  --> $DIR/expr-rarrow-call-on-a-raw-pointer.rs:19:14
+   |
+LL |     unnamed->0 += 1;
+   |              ^ unknown field
+   |
+help: `unnamed` is a raw pointer; try dereferencing it
+   |
+LL -     unnamed->0 += 1;
+LL +     (*unnamed).0 += 1;
+   |
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0609`.

Diff for: tests/ui/parser/expr-rarrow-call.fixed

@@ -1,4 +1,3 @@
-//@ run-rustfix
 #![allow(
     dead_code,
     unused_must_use
@@ -11,23 +10,23 @@ struct Named {
 struct Unnamed(usize);
 
 fn named_struct_field_access(named: &Named) {
-    named->foo; //~ ERROR `->` used for field access or method call
+    named->foo; //~ ERROR `->` is not valid for field access or method call
 }
 
 fn unnamed_struct_field_access(unnamed: &Unnamed) {
-    unnamed->0; //~ ERROR `->` used for field access or method call
+    unnamed->0; //~ ERROR `->` is not valid for field access or method call
 }
 
 fn tuple_field_access(t: &(u8, u8)) {
-    t->0; //~ ERROR `->` used for field access or method call
-    t->1; //~ ERROR `->` used for field access or method call
+    t->0; //~ ERROR `->` is not valid for field access or method call
+    t->1; //~ ERROR `->` is not valid for field access or method call
 }
 
 #[derive(Clone)]
 struct Foo;
 
 fn method_call(foo: &Foo) {
-    foo->clone(); //~ ERROR `->` used for field access or method call
+    foo->clone(); //~ ERROR `->` is not valid for field access or method call
 }
 
 fn main() {}

Diff for: tests/ui/parser/expr-rarrow-call.rs

@@ -1,67 +1,42 @@
-error: `->` used for field access or method call
-  --> $DIR/expr-rarrow-call.rs:14:10
+error: `->` is not valid for field access or method call
+  --> $DIR/expr-rarrow-call.rs:13:10
    |
 LL |     named->foo;
    |          ^^
    |
-   = help: the `.` operator will dereference the value if needed
-help: try using `.` instead
-   |
-LL -     named->foo;
-LL +     named.foo;
-   |
+   = help: the `.` operator will automatically dereference the value, except if the value is a raw pointer
 
-error: `->` used for field access or method call
-  --> $DIR/expr-rarrow-call.rs:18:12
+error: `->` is not valid for field access or method call
+  --> $DIR/expr-rarrow-call.rs:17:12
    |
 LL |     unnamed->0;
    |            ^^
    |
-   = help: the `.` operator will dereference the value if needed
-help: try using `.` instead
-   |
-LL -     unnamed->0;
-LL +     unnamed.0;
-   |
+   = help: the `.` operator will automatically dereference the value, except if the value is a raw pointer
 
-error: `->` used for field access or method call
-  --> $DIR/expr-rarrow-call.rs:22:6
+error: `->` is not valid for field access or method call
+  --> $DIR/expr-rarrow-call.rs:21:6
    |
 LL |     t->0;
    |      ^^
    |
-   = help: the `.` operator will dereference the value if needed
-help: try using `.` instead
-   |
-LL -     t->0;
-LL +     t.0;
-   |
+   = help: the `.` operator will automatically dereference the value, except if the value is a raw pointer
 
-error: `->` used for field access or method call
-  --> $DIR/expr-rarrow-call.rs:23:6
+error: `->` is not valid for field access or method call
+  --> $DIR/expr-rarrow-call.rs:22:6
    |
 LL |     t->1;
    |      ^^
    |
-   = help: the `.` operator will dereference the value if needed
-help: try using `.` instead
-   |
-LL -     t->1;
-LL +     t.1;
-   |
+   = help: the `.` operator will automatically dereference the value, except if the value is a raw pointer
 
-error: `->` used for field access or method call
-  --> $DIR/expr-rarrow-call.rs:30:8
+error: `->` is not valid for field access or method call
+  --> $DIR/expr-rarrow-call.rs:29:8
    |
 LL |     foo->clone();
    |        ^^
    |
-   = help: the `.` operator will dereference the value if needed
-help: try using `.` instead
-   |
-LL -     foo->clone();
-LL +     foo.clone();
-   |
+   = help: the `.` operator will automatically dereference the value, except if the value is a raw pointer
 
 error: aborting due to 5 previous errors
 

Diff for: tests/ui/parser/expr-rarrow-call.stderr

@@ -5,7 +5,7 @@ fn bar() -> String {
     attr::fn bar() -> String { //~ ERROR expected identifier, found keyword `fn`
     //~^ ERROR expected one of `(`, `.`, `::`, `;`, `?`, `}`, or an operator, found `{`
     //~| ERROR expected `;`, found `bar`
-    //~| ERROR `->` used for field access or method call
+    //~| ERROR `->` is not valid for field access or method call
     #[attr]
     [1, 2, 3].iter().map().collect::<String>()
     #[attr]

Diff for: tests/ui/parser/issues/issue-118530-ice.rs

@@ -33,18 +33,13 @@ LL |     attr::fn bar() -> String {
    |             |
    |             help: add `;` here
 
-error: `->` used for field access or method call
+error: `->` is not valid for field access or method call
   --> $DIR/issue-118530-ice.rs:5:20
    |
 LL |     attr::fn bar() -> String {
    |                    ^^
    |
-   = help: the `.` operator will dereference the value if needed
-help: try using `.` instead
-   |
-LL -     attr::fn bar() -> String {
-LL +     attr::fn bar() . String {
-   |
+   = help: the `.` operator will automatically dereference the value, except if the value is a raw pointer
 
 error: expected one of `(`, `.`, `::`, `;`, `?`, `}`, or an operator, found `{`
   --> $DIR/issue-118530-ice.rs:5:30