---

yaml
---
r: 105404
b: refs/heads/master
c: 6fa72df
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6b2888aeec08c56200ed26576eafb2d27ca079b8
+refs/heads/master: 6fa72dfe48c8db04562f4d3ab640cb90804af69b
 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/libtime/lib.rs

@@ -187,20 +187,51 @@ pub fn tzset() {
     }
 }
 
+/// Holds a calendar date and time broken down into its components (year, month, day, and so on),
+/// also called a broken-down time value.
 #[deriving(Clone, Eq, Encodable, Decodable, Show)]
 pub struct Tm {
-    tm_sec: i32, // seconds after the minute ~[0-60]
-    tm_min: i32, // minutes after the hour ~[0-59]
-    tm_hour: i32, // hours after midnight ~[0-23]
-    tm_mday: i32, // days of the month ~[1-31]
-    tm_mon: i32, // months since January ~[0-11]
-    tm_year: i32, // years since 1900
-    tm_wday: i32, // days since Sunday ~[0-6]
-    tm_yday: i32, // days since January 1 ~[0-365]
-    tm_isdst: i32, // Daylight Savings Time flag
-    tm_gmtoff: i32, // offset from UTC in seconds
-    tm_zone: ~str, // timezone abbreviation
-    tm_nsec: i32, // nanoseconds
+    /// Seconds after the minute – [0, 60]
+    tm_sec: i32,
+
+    /// Minutes after the hour – [0, 59]
+    tm_min: i32,
+
+    /// Hours after midnight – [0, 23]
+    tm_hour: i32,
+
+    /// Day of the month – [1, 31]
+    tm_mday: i32,
+
+    /// Months since January – [0, 11]
+    tm_mon: i32,
+
+    /// Years since 1900
+    tm_year: i32,
+
+    /// Days since Sunday – [0, 6]. 0 = Sunday, 1 = Monday, …, 6 = Saturday.
+    tm_wday: i32,
+
+    /// Days since January 1 – [0, 365]
+    tm_yday: i32,
+
+    /// Daylight Saving Time flag.
+    ///
+    /// This value is positive if Daylight Saving Time is in effect, zero if Daylight Saving Time
+    /// is not in effect, and negative if this information is not available.
+    tm_isdst: i32,
+
+    /// Identifies the time zone that was used to compute this broken-down time value, including any
+    /// adjustment for Daylight Saving Time. This is the number of seconds east of UTC. For example,
+    /// for U.S. Pacific Daylight Time, the value is -7*60*60 = -25200.
+    tm_gmtoff: i32,
+
+    /// Abbreviated name for the time zone that was used to compute this broken-down time value.
+    /// For example, U.S. Pacific Daylight Time is "PDT".
+    tm_zone: ~str,
+
+    /// Nanoseconds after the second – [0, 10<sup>9</sup> - 1]
+    tm_nsec: i32,
 }
 
 pub fn empty_tm() -> Tm {

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};