Revert change to one test because of inconsistent output in aarc64

Author: estebank

tests/ui/confuse-field-and-method/issue-2392.rs

@@ -1,5 +1,3 @@
-//@ compile-flags: -Zwrite-long-types-to-disk=yes
-
 struct FuncContainer {
     f1: fn(data: u8),
     f2: extern "C" fn(data: u8),

tests/ui/confuse-field-and-method/issue-2392.stderr

@@ -1,21 +1,19 @@
-error[E0599]: no method named `closure` found for struct `Obj<{[email protected]:37:36}>` in the current scope
-  --> $DIR/issue-2392.rs:38:15
+error[E0599]: no method named `closure` found for struct `Obj<{closure@$DIR/issue-2392.rs:35:36: 35:38}>` in the current scope
+  --> $DIR/issue-2392.rs:36:15
    |
 LL | struct Obj<F> where F: FnOnce() -> u32 {
    | ------------- method `closure` not found for this struct
 ...
 LL |     o_closure.closure();
    |               ^^^^^^^ field, not a method
    |
-   = note: the full name for the type has been written to '$TEST_BUILD_DIR/issue-2392.long-type-$LONG_TYPE_HASH.txt'
-   = note: consider using `--verbose` to print the full type name to the console
 help: to call the closure stored in `closure`, surround the field access with parentheses
    |
 LL |     (o_closure.closure)();
    |     +                 +
 
-error[E0599]: no method named `not_closure` found for struct `Obj<{[email protected]:37:36}>` in the current scope
-  --> $DIR/issue-2392.rs:40:15
+error[E0599]: no method named `not_closure` found for struct `Obj<{closure@$DIR/issue-2392.rs:35:36: 35:38}>` in the current scope
+  --> $DIR/issue-2392.rs:38:15
    |
 LL | struct Obj<F> where F: FnOnce() -> u32 {
    | ------------- method `not_closure` not found for this struct
@@ -24,12 +22,9 @@ LL |     o_closure.not_closure();
    |               ^^^^^^^^^^^-- help: remove the arguments
    |               |
    |               field, not a method
-   |
-   = note: the full name for the type has been written to '$TEST_BUILD_DIR/issue-2392.long-type-$LONG_TYPE_HASH.txt'
-   = note: consider using `--verbose` to print the full type name to the console
 
 error[E0599]: no method named `closure` found for struct `Obj<fn() -> u32 {func}>` in the current scope
-  --> $DIR/issue-2392.rs:44:12
+  --> $DIR/issue-2392.rs:42:12
    |
 LL | struct Obj<F> where F: FnOnce() -> u32 {
    | ------------- method `closure` not found for this struct
@@ -43,7 +38,7 @@ LL |     (o_func.closure)();
    |     +              +
 
 error[E0599]: no method named `boxed_closure` found for struct `BoxedObj` in the current scope
-  --> $DIR/issue-2392.rs:47:14
+  --> $DIR/issue-2392.rs:45:14
    |
 LL | struct BoxedObj {
    | --------------- method `boxed_closure` not found for this struct
@@ -57,7 +52,7 @@ LL |     (boxed_fn.boxed_closure)();
    |     +                      +
 
 error[E0599]: no method named `boxed_closure` found for struct `BoxedObj` in the current scope
-  --> $DIR/issue-2392.rs:50:19
+  --> $DIR/issue-2392.rs:48:19
    |
 LL | struct BoxedObj {
    | --------------- method `boxed_closure` not found for this struct
@@ -71,7 +66,7 @@ LL |     (boxed_closure.boxed_closure)();
    |     +                           +
 
 error[E0599]: no method named `closure` found for struct `Obj<fn() -> u32 {func}>` in the current scope
-  --> $DIR/issue-2392.rs:55:12
+  --> $DIR/issue-2392.rs:53:12
    |
 LL | struct Obj<F> where F: FnOnce() -> u32 {
    | ------------- method `closure` not found for this struct
@@ -85,7 +80,7 @@ LL |     (w.wrap.closure)();
    |     +              +
 
 error[E0599]: no method named `not_closure` found for struct `Obj<fn() -> u32 {func}>` in the current scope
-  --> $DIR/issue-2392.rs:57:12
+  --> $DIR/issue-2392.rs:55:12
    |
 LL | struct Obj<F> where F: FnOnce() -> u32 {
    | ------------- method `not_closure` not found for this struct
@@ -96,7 +91,7 @@ LL |     w.wrap.not_closure();
    |            field, not a method
 
 error[E0599]: no method named `closure` found for struct `Obj<Box<(dyn FnOnce() -> u32 + 'static)>>` in the current scope
-  --> $DIR/issue-2392.rs:60:24
+  --> $DIR/issue-2392.rs:58:24
    |
 LL | struct Obj<F> where F: FnOnce() -> u32 {
    | ------------- method `closure` not found for this struct
@@ -110,7 +105,7 @@ LL |     (check_expression().closure)();
    |     +                          +
 
 error[E0599]: no method named `f1` found for struct `FuncContainer` in the current scope
-  --> $DIR/issue-2392.rs:66:31
+  --> $DIR/issue-2392.rs:64:31
    |
 LL | struct FuncContainer {
    | -------------------- method `f1` not found for this struct
@@ -124,7 +119,7 @@ LL |             ((*self.container).f1)(1);
    |             +                    +
 
 error[E0599]: no method named `f2` found for struct `FuncContainer` in the current scope
-  --> $DIR/issue-2392.rs:67:31
+  --> $DIR/issue-2392.rs:65:31
    |
 LL | struct FuncContainer {
    | -------------------- method `f2` not found for this struct
@@ -138,7 +133,7 @@ LL |             ((*self.container).f2)(1);
    |             +                    +
 
 error[E0599]: no method named `f3` found for struct `FuncContainer` in the current scope
-  --> $DIR/issue-2392.rs:68:31
+  --> $DIR/issue-2392.rs:66:31
    |
 LL | struct FuncContainer {
    | -------------------- method `f3` not found for this struct