---

yaml
---
r: 273366
b: refs/heads/beta
c: 5e3b36c
h: refs/heads/master

Author: Daniel J Rollins

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 2dd5776b1110a24d9ceb1d1f89dd684d0e63fbf7
+refs/heads/beta: 5e3b36c100c298f64bb947ea8771f3f38f94fad8
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_typeck/check/method/suggest.rs

@@ -130,18 +130,18 @@ pub fn report_error<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
             }
 
             if is_fn_ty(&rcvr_ty, &fcx, span) {
-                let expr_string = match rcvr_expr {
-                    Some(expr) => match cx.sess.codemap().span_to_snippet(expr.span) {
-                        Ok(expr_string) => expr_string,
-                        _ => "s".into()
-                    },
-                    _ => "s".into()
-                };
-                err.fileline_note(
-                    span,
-                    &format!("method invoked on function type. did you \
-                             mean `{}().{}(...)`?",
-                             expr_string, item_name));
+                if let Some(expr) = rcvr_expr {
+                    if let Ok (expr_string) = cx.sess.codemap().span_to_snippet(expr.span) {
+                        err.fileline_note(
+                            expr.span,
+                            &format!("{} is a function, perhaps you wish to call it?",
+                                     expr_string));
+                        err.span_suggestion(expr.span,
+                                            "try calling the base function:",
+                                            format!("{}()",
+                                                    expr_string));
+                    }
+                }
             }
 
             if !static_sources.is_empty() {