---

yaml
---
r: 273368
b: refs/heads/beta
c: 2343712
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: fa0efa69c5df0164a5abcebfbb2434cc1f27ecb1
+refs/heads/beta: 234371216e0eb717ddc9cf00fb222885f4228798
 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

@@ -25,11 +25,13 @@ use middle::subst::Substs;
 use middle::traits::{Obligation, SelectionContext};
 use util::nodemap::{FnvHashSet};
 
+
 use syntax::ast;
 use syntax::codemap::Span;
 use syntax::errors::DiagnosticBuilder;
 use rustc_front::print::pprust;
 use rustc_front::hir;
+use rustc_front::hir::Expr_;
 
 use std::cell;
 use std::cmp::Ordering;
@@ -130,17 +132,28 @@ pub fn report_error<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
             }
 
             if is_fn_ty(&rcvr_ty, &fcx, span) {
-                if let Some(expr) = rcvr_expr {
-                    if let Ok (expr_string) = cx.sess.codemap().span_to_snippet(expr.span) {
+                macro_rules! report_function {
+                    ($span:expr, $name:expr) => {
                         err.fileline_note(
-                            expr.span,
+                            $span,
                             &format!("{} is a function, perhaps you wish to call it",
-                                     expr_string));
+                                     $name));
+                    }
+                }
+
+                if let Some(expr) = rcvr_expr {
+                    if let Ok (expr_string) = cx.sess.codemap().span_to_snippet(expr.span) {
+                        report_function!(expr.span, expr_string);
                         err.span_suggestion(expr.span,
                                             "try calling the base function:",
                                             format!("{}()",
                                                     expr_string));
                     }
+                    else if let Expr_::ExprPath(_, path) = expr.node.clone() {
+                        if let Some(segment) = path.segments.last() {
+                            report_function!(expr.span, segment.identifier.name);
+                        }
+                    }
                 }
             }
 

branches/beta/src/test/compile-fail/issue-29124.rs

@@ -22,10 +22,10 @@ fn func() -> ret {
 }
 
 fn main() {
-    obj::func.x(); 
+    obj::func.x();
     //~^ ERROR no method named `x` found for type `fn() -> ret {obj::func}` in the current scope
     //~^^ NOTE obj::func is a function, perhaps you wish to call it
-    func.x(); 
+    func.x();
     //~^ ERROR no method named `x` found for type `fn() -> ret {func}` in the current scope
     //~^^ NOTE func is a function, perhaps you wish to call it
 }