revert some changes

Author: Kivooeo

compiler/rustc_parse/messages.ftl

@@ -246,7 +246,7 @@ 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 = `->` is not valid for field access or method call
+parse_expr_rarrow_call = `->` is not valid syntax for field accesses and method calls
     .suggestion = try using `.` instead
     .help = the `.` operator will automatically dereference the value, except if the value is a raw pointer
 

compiler/rustc_parse/src/errors.rs

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

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

@@ -1,4 +1,3 @@
-//@ run-rustfix
 #![allow(
     dead_code,
     unused_must_use
@@ -11,12 +10,12 @@ struct Named {
 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
+    named->foo += 1; //~ ERROR `->` is not valid syntax for field accesses and method calls
     //~^ 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
+    unnamed->0 += 1; //~ ERROR `->` is not valid syntax for field accesses and method calls
     //~^ ERROR no field `0` on type `*mut Unnamed`
 }
 

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

@@ -1,21 +1,31 @@
-error: `->` is not valid for field access or method call
-  --> $DIR/expr-rarrow-call-on-a-raw-pointer.rs:14:10
+error: `->` is not valid syntax for field accesses and method calls
+  --> $DIR/expr-rarrow-call-on-a-raw-pointer.rs:13:10
    |
 LL |     named->foo += 1;
    |          ^^
    |
    = help: the `.` operator will automatically dereference the value, except if the value is a raw pointer
+help: try using `.` instead
+   |
+LL -     named->foo += 1;
+LL +     named.foo += 1;
+   |
 
-error: `->` is not valid for field access or method call
-  --> $DIR/expr-rarrow-call-on-a-raw-pointer.rs:19:12
+error: `->` is not valid syntax for field accesses and method calls
+  --> $DIR/expr-rarrow-call-on-a-raw-pointer.rs:18:12
    |
 LL |     unnamed->0 += 1;
    |            ^^
    |
    = help: the `.` operator will automatically dereference the value, except if the value is a raw pointer
+help: try using `.` instead
+   |
+LL -     unnamed->0 += 1;
+LL +     unnamed.0 += 1;
+   |
 
 error[E0609]: no field `foo` on type `*mut Named`
-  --> $DIR/expr-rarrow-call-on-a-raw-pointer.rs:14:12
+  --> $DIR/expr-rarrow-call-on-a-raw-pointer.rs:13:12
    |
 LL |     named->foo += 1;
    |            ^^^ unknown field
@@ -27,7 +37,7 @@ LL +     (*named).foo += 1;
    |
 
 error[E0609]: no field `0` on type `*mut Unnamed`
-  --> $DIR/expr-rarrow-call-on-a-raw-pointer.rs:19:14
+  --> $DIR/expr-rarrow-call-on-a-raw-pointer.rs:18:14
    |
 LL |     unnamed->0 += 1;
    |              ^ unknown field

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

@@ -10,23 +10,23 @@ struct Named {
 struct Unnamed(usize);
 
 fn named_struct_field_access(named: &Named) {
-    named->foo; //~ ERROR `->` is not valid for field access or method call
+    named->foo; //~ ERROR `->` is not valid syntax for field accesses and method calls
 }
 
 fn unnamed_struct_field_access(unnamed: &Unnamed) {
-    unnamed->0; //~ ERROR `->` is not valid for field access or method call
+    unnamed->0; //~ ERROR `->` is not valid syntax for field accesses and method calls
 }
 
 fn tuple_field_access(t: &(u8, u8)) {
-    t->0; //~ ERROR `->` is not valid for field access or method call
-    t->1; //~ ERROR `->` is not valid for field access or method call
+    t->0; //~ ERROR `->` is not valid syntax for field accesses and method calls
+    t->1; //~ ERROR `->` is not valid syntax for field accesses and method calls
 }
 
 #[derive(Clone)]
 struct Foo;
 
 fn method_call(foo: &Foo) {
-    foo->clone(); //~ ERROR `->` is not valid for field access or method call
+    foo->clone(); //~ ERROR `->` is not valid syntax for field accesses and method calls
 }
 
 fn main() {}

tests/ui/parser/expr-rarrow-call.rs

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

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 `->` is not valid for field access or method call
+    //~| ERROR `->` is not valid syntax for field accesses and method calls
     #[attr]
     [1, 2, 3].iter().map().collect::<String>()
     #[attr]

tests/ui/parser/issues/issue-118530-ice.rs

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