---

yaml
---
r: 273367
b: refs/heads/beta
c: fa0efa6
h: refs/heads/master
i:
  273365: 06a5060
  273363: 4dbbaea
  273359: fb6d490

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: 5e3b36c100c298f64bb947ea8771f3f38f94fad8
+refs/heads/beta: fa0efa69c5df0164a5abcebfbb2434cc1f27ecb1
 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

@@ -134,7 +134,7 @@ pub fn report_error<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
                     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?",
+                            &format!("{} is a function, perhaps you wish to call it",
                                      expr_string));
                         err.span_suggestion(expr.span,
                                             "try calling the base function:",

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

@@ -0,0 +1,31 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+struct ret;
+struct obj;
+
+impl obj {
+    fn func() -> ret {
+        ret
+    }
+}
+
+fn func() -> ret {
+    ret
+}
+
+fn main() {
+    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(); 
+    //~^ 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
+}