Simplify labels and move tests to ui

Author: estebank

src/librustc_typeck/check/method/suggest.rs

@@ -202,19 +202,13 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
                                                            stored in the `{1}` field",
                                                           expr_string,
                                                           item_name));
-                                        err.span_label(span,
-                                                       &format!("`{}` is a field storing a \
-                                                                 function, not a method",
-                                                                item_name));
                                     } else {
                                         err.help(&format!("did you mean to write `{0}.{1}` \
                                                            instead of `{0}.{1}(...)`?",
                                                           expr_string,
                                                           item_name));
-                                        err.span_label(span,
-                                                       &format!("`{}` is a field, not a method",
-                                                                item_name));
                                     }
+                                    err.span_label(span, &"field, not a method");
                                     break;
                                 }
                             }

src/test/compile-fail/issue-18343.rs renamed to src/test/ui/suggestions/confuse-field-and-method/issue-18343.rs

@@ -17,5 +17,5 @@ fn main() {
     o.closure();
     //~^ ERROR no method named `closure` found
     //~| HELP use `(o.closure)(...)` if you meant to call the function stored in the `closure` field
-    //~| NOTE `closure` is a field storing a function, not a method
+    //~| NOTE field, not a method
 }

src/test/ui/suggestions/confuse-field-and-method/issue-18343.stderr

@@ -0,0 +1,10 @@
+error: no method named `closure` found for type `Obj<[closure@$DIR/issue-18343.rs:16:28: 16:33]>` in the current scope
+  --> $DIR/issue-18343.rs:17:7
+   |
+17 |     o.closure();
+   |       ^^^^^^^ field, not a method
+   |
+   = help: use `(o.closure)(...)` if you meant to call the function stored in the `closure` field
+
+error: aborting due to previous error
+

src/test/compile-fail/issue-2392.rs renamed to src/test/ui/suggestions/confuse-field-and-method/issue-2392.rs

@@ -49,57 +49,57 @@ fn main() {
     let o_closure = Obj { closure: || 42, not_closure: 42 };
     o_closure.closure(); //~ ERROR no method named `closure` found
     //~^ HELP use `(o_closure.closure)(...)` if you meant to call the function stored
-    //~| NOTE `closure` is a field storing a function, not a method
+    //~| NOTE field, not a method
 
     o_closure.not_closure();
     //~^ ERROR no method named `not_closure` found
-    //~| NOTE `not_closure` is a field, not a method
+    //~| NOTE field, not a method
     //~| HELP did you mean to write `o_closure.not_closure` instead of `o_closure.not_closure(...)`?
 
     let o_func = Obj { closure: func, not_closure: 5 };
     o_func.closure(); //~ ERROR no method named `closure` found
     //~^ HELP use `(o_func.closure)(...)` if you meant to call the function stored
-    //~| NOTE `closure` is a field storing a function, not a method
+    //~| NOTE field, not a method
 
     let boxed_fn = BoxedObj { boxed_closure: Box::new(func) };
     boxed_fn.boxed_closure();//~ ERROR no method named `boxed_closure` found
     //~^ HELP use `(boxed_fn.boxed_closure)(...)` if you meant to call the function stored
-    //~| NOTE `boxed_closure` is a field storing a function, not a method
+    //~| NOTE field, not a method
 
     let boxed_closure = BoxedObj { boxed_closure: Box::new(|| 42_u32) as Box<FnBox() -> u32> };
     boxed_closure.boxed_closure();//~ ERROR no method named `boxed_closure` found
     //~^ HELP use `(boxed_closure.boxed_closure)(...)` if you meant to call the function stored
-    //~| NOTE `boxed_closure` is a field storing a function, not a method
+    //~| NOTE field, not a method
 
     // test expression writing in the notes
 
     let w = Wrapper { wrap: o_func };
     w.wrap.closure();//~ ERROR no method named `closure` found
     //~^ HELP use `(w.wrap.closure)(...)` if you meant to call the function stored
-    //~| NOTE `closure` is a field storing a function, not a method
+    //~| NOTE field, not a method
 
     w.wrap.not_closure();
     //~^ ERROR no method named `not_closure` found
-    //~| NOTE `not_closure` is a field, not a method
+    //~| NOTE field, not a method
     //~| HELP did you mean to write `w.wrap.not_closure` instead of `w.wrap.not_closure(...)`?
 
     check_expression().closure();//~ ERROR no method named `closure` found
     //~^ HELP use `(check_expression().closure)(...)` if you meant to call the function stored
-    //~| NOTE `closure` is a field storing a function, not a method
+    //~| NOTE field, not a method
 }
 
 impl FuncContainerOuter {
     fn run(&self) {
         unsafe {
             (*self.container).f1(1); //~ ERROR no method named `f1` found
             //~^ HELP use `((*self.container).f1)(...)`
-            //~| NOTE `f1` is a field storing a function, not a method
+            //~| NOTE field, not a method
             (*self.container).f2(1); //~ ERROR no method named `f2` found
             //~^ HELP use `((*self.container).f2)(...)`
-            //~| NOTE `f2` is a field storing a function, not a method
+            //~| NOTE field, not a method
             (*self.container).f3(1); //~ ERROR no method named `f3` found
             //~^ HELP use `((*self.container).f3)(...)`
-            //~| NOTE `f3` is a field storing a function, not a method
+            //~| NOTE field, not a method
         }
     }
 }

src/test/ui/suggestions/confuse-field-and-method/issue-2392.stderr

@@ -0,0 +1,90 @@
+error: no method named `closure` found for type `Obj<[closure@$DIR/issue-2392.rs:49:36: 49:41]>` in the current scope
+  --> $DIR/issue-2392.rs:50:15
+   |
+50 |     o_closure.closure(); //~ ERROR no method named `closure` found
+   |               ^^^^^^^ field, not a method
+   |
+   = help: use `(o_closure.closure)(...)` if you meant to call the function stored in the `closure` field
+
+error: no method named `not_closure` found for type `Obj<[closure@$DIR/issue-2392.rs:49:36: 49:41]>` in the current scope
+  --> $DIR/issue-2392.rs:54:15
+   |
+54 |     o_closure.not_closure();
+   |               ^^^^^^^^^^^ field, not a method
+   |
+   = help: did you mean to write `o_closure.not_closure` instead of `o_closure.not_closure(...)`?
+
+error: no method named `closure` found for type `Obj<fn() -> u32 {func}>` in the current scope
+  --> $DIR/issue-2392.rs:60:12
+   |
+60 |     o_func.closure(); //~ ERROR no method named `closure` found
+   |            ^^^^^^^ field, not a method
+   |
+   = help: use `(o_func.closure)(...)` if you meant to call the function stored in the `closure` field
+
+error: no method named `boxed_closure` found for type `BoxedObj` in the current scope
+  --> $DIR/issue-2392.rs:65:14
+   |
+65 |     boxed_fn.boxed_closure();//~ ERROR no method named `boxed_closure` found
+   |              ^^^^^^^^^^^^^ field, not a method
+   |
+   = help: use `(boxed_fn.boxed_closure)(...)` if you meant to call the function stored in the `boxed_closure` field
+
+error: no method named `boxed_closure` found for type `BoxedObj` in the current scope
+  --> $DIR/issue-2392.rs:70:19
+   |
+70 |     boxed_closure.boxed_closure();//~ ERROR no method named `boxed_closure` found
+   |                   ^^^^^^^^^^^^^ field, not a method
+   |
+   = help: use `(boxed_closure.boxed_closure)(...)` if you meant to call the function stored in the `boxed_closure` field
+
+error: no method named `closure` found for type `Obj<fn() -> u32 {func}>` in the current scope
+  --> $DIR/issue-2392.rs:77:12
+   |
+77 |     w.wrap.closure();//~ ERROR no method named `closure` found
+   |            ^^^^^^^ field, not a method
+   |
+   = help: use `(w.wrap.closure)(...)` if you meant to call the function stored in the `closure` field
+
+error: no method named `not_closure` found for type `Obj<fn() -> u32 {func}>` in the current scope
+  --> $DIR/issue-2392.rs:81:12
+   |
+81 |     w.wrap.not_closure();
+   |            ^^^^^^^^^^^ field, not a method
+   |
+   = help: did you mean to write `w.wrap.not_closure` instead of `w.wrap.not_closure(...)`?
+
+error: no method named `closure` found for type `Obj<std::boxed::Box<std::boxed::FnBox<(), Output=u32> + 'static>>` in the current scope
+  --> $DIR/issue-2392.rs:86:24
+   |
+86 |     check_expression().closure();//~ ERROR no method named `closure` found
+   |                        ^^^^^^^ field, not a method
+   |
+   = help: use `(check_expression().closure)(...)` if you meant to call the function stored in the `closure` field
+
+error: no method named `f1` found for type `FuncContainer` in the current scope
+  --> $DIR/issue-2392.rs:94:31
+   |
+94 |             (*self.container).f1(1); //~ ERROR no method named `f1` found
+   |                               ^^ field, not a method
+   |
+   = help: use `((*self.container).f1)(...)` if you meant to call the function stored in the `f1` field
+
+error: no method named `f2` found for type `FuncContainer` in the current scope
+  --> $DIR/issue-2392.rs:97:31
+   |
+97 |             (*self.container).f2(1); //~ ERROR no method named `f2` found
+   |                               ^^ field, not a method
+   |
+   = help: use `((*self.container).f2)(...)` if you meant to call the function stored in the `f2` field
+
+error: no method named `f3` found for type `FuncContainer` in the current scope
+   --> $DIR/issue-2392.rs:100:31
+    |
+100 |             (*self.container).f3(1); //~ ERROR no method named `f3` found
+    |                               ^^ field, not a method
+    |
+    = help: use `((*self.container).f3)(...)` if you meant to call the function stored in the `f3` field
+
+error: aborting due to 11 previous errors
+

src/test/compile-fail/issue-32128.rs renamed to src/test/ui/suggestions/confuse-field-and-method/issue-32128.rs

@@ -22,6 +22,6 @@ fn main() {
     demo.example(1);
     //~^ ERROR no method named `example`
     //~| HELP use `(demo.example)(...)`
-    //~| NOTE `example` is a field storing a function, not a method
+    //~| NOTE field, not a method
     // (demo.example)(1);
 }

src/test/ui/suggestions/confuse-field-and-method/issue-32128.stderr

@@ -0,0 +1,10 @@
+error: no method named `example` found for type `Example` in the current scope
+  --> $DIR/issue-32128.rs:22:10
+   |
+22 |     demo.example(1);
+   |          ^^^^^^^ field, not a method
+   |
+   = help: use `(demo.example)(...)` if you meant to call the function stored in the `example` field
+
+error: aborting due to previous error
+

src/test/compile-fail/issue-33784.rs renamed to src/test/ui/suggestions/confuse-field-and-method/issue-33784.rs

@@ -0,0 +1,26 @@
+error: no method named `closure` found for type `&Obj<[closure@$DIR/issue-33784.rs:35:43: 35:48]>` in the current scope
+  --> $DIR/issue-33784.rs:37:7
+   |
+37 |     p.closure(); //~ ERROR no method named `closure` found
+   |       ^^^^^^^ field, not a method
+   |
+   = help: use `(p.closure)(...)` if you meant to call the function stored in the `closure` field
+
+error: no method named `fn_ptr` found for type `&&Obj<[closure@$DIR/issue-33784.rs:35:43: 35:48]>` in the current scope
+  --> $DIR/issue-33784.rs:41:7
+   |
+41 |     q.fn_ptr(); //~ ERROR no method named `fn_ptr` found
+   |       ^^^^^^ field, not a method
+   |
+   = help: use `(q.fn_ptr)(...)` if you meant to call the function stored in the `fn_ptr` field
+
+error: no method named `c_fn_ptr` found for type `&D` in the current scope
+  --> $DIR/issue-33784.rs:46:7
+   |
+46 |     s.c_fn_ptr(); //~ ERROR no method named `c_fn_ptr` found
+   |       ^^^^^^^^ field, not a method
+   |
+   = help: use `(s.c_fn_ptr)(...)` if you meant to call the function stored in the `c_fn_ptr` field
+
+error: aborting due to 3 previous errors
+