---

yaml
---
r: 105402
b: refs/heads/master
c: ffe72e9
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5bb9bd2d346c5921d35da5e743d1f20534b2b4d7
+refs/heads/master: ffe72e95368aba02d002be0095522548e8f0ee79
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b8601a3d8b91ad3b653d143307611f2f5c75617e
 refs/heads/try: db814977d07bd798feb24f6b74c00800ef458a13

trunk/src/librustc/middle/typeck/check/mod.rs

@@ -2317,11 +2317,13 @@ fn check_expr_with_unifier(fcx: @FnCtxt,
                 fcx.type_error_message(
                     expr.span,
                     |actual| {
-                        format!("attempted to take value of method `{}` on type `{}` \
-                                 (try writing an anonymous function)",
+                        format!("attempted to take value of method `{}` on type `{}`",
                                 token::get_name(field), actual)
                     },
                     expr_t, None);
+
+                tcx.sess.span_note(expr.span,
+                    "maybe a missing `()` to call it? If not, try an anonymous function.");
             }
 
             None => {

trunk/src/libstd/option.rs

@@ -311,10 +311,10 @@ impl<T> Option<T> {
     /// Fails if the value equals `None`.
     #[inline]
     pub fn take_unwrap(&mut self) -> T {
-        if self.is_none() {
-            fail!("called `Option::take_unwrap()` on a `None` value")
+        match self.take() {
+            Some(x) => x,
+            None => fail!("called `Option::take_unwrap()` on a `None` value")
         }
-        self.take().unwrap()
     }
 
     /// Gets an immutable reference to the value inside an option.

trunk/src/test/compile-fail/method-missing-call.rs

@@ -0,0 +1,34 @@
+// Copyright 2014 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.
+
+// Tests to make sure that parens are needed for method calls without arguments.
+// outputs text to make sure either an anonymous function is provided or
+// open-close '()' parens are given
+
+
+struct Point {
+    x: int,
+    y: int
+}
+impl Point {
+    fn new() -> Point {
+        Point{x:0, y:0}
+    }
+    fn get_x(&self) -> int {
+        self.x
+    }
+}
+
+fn main() {
+    let point: Point = Point::new();
+    let px: int =  point.get_x;//~ ERROR attempted to take value of method `get_x` on type `Point`
+    //~^ NOTE maybe a missing `()` to call it? If not, try an anonymous function.
+}
+

trunk/src/test/run-pass/tcp-stress.rs

@@ -13,6 +13,10 @@
 // ignore-android needs extra network permissions
 // exec-env:RUST_LOG=debug
 
+#[feature(phase)];
+#[phase(syntax, link)]
+extern crate log;
+
 use std::libc;
 use std::io::net::ip::{Ipv4Addr, SocketAddr};
 use std::io::net::tcp::{TcpListener, TcpStream};