---

yaml
---
r: 218611
b: refs/heads/tmp
c: ef8c377
h: refs/heads/master
i:
  218609: bedfbf8
  218607: ac8bb73
v: v3

Author: tshepang

[refs]

@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/beta: c8bab9d06a179028a0d5129aa62f09d694d9cc49
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: dcc64d113ccdd4ecfe33fb35267ef4533cfefb00
+refs/heads/tmp: ef8c3775afd735140a5a4f8c2fa30ac8e5ac51c7
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 1b28ffa5216c845d1cef6b0cb3e5ac7db12025d0
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/mk/cfg/i686-unknown-freebsd.mk

@@ -108,7 +108,7 @@ impl<T> VecDeque<T> {
         ptr::write(self.ptr.offset(off as isize), t);
     }
 
-    /// Returns true if and only if the buffer is at capacity
+    /// Returns true iff the buffer is at capacity
     #[inline]
     fn is_full(&self) -> bool { self.cap - self.len() == 1 }
 

branches/tmp/src/libcollections/vec_deque.rs

@@ -175,12 +175,6 @@ impl<'a, 'b: 'a> DebugTuple<'a, 'b> {
     fn is_pretty(&self) -> bool {
         self.fmt.flags() & (1 << (FlagV1::Alternate as usize)) != 0
     }
-
-    /// Returns the wrapped `Formatter`.
-    #[unstable(feature = "debug_builder_formatter", reason = "recently added")]
-    pub fn formatter(&mut self) -> &mut fmt::Formatter<'b> {
-        &mut self.fmt
-    }
 }
 
 struct DebugInner<'a, 'b: 'a> {

branches/tmp/src/libcore/fmt/builders.rs

@@ -1488,19 +1488,20 @@ macro_rules! tuple {
         impl<$($name:Debug),*> Debug for ($($name,)*) {
             #[allow(non_snake_case, unused_assignments)]
             fn fmt(&self, f: &mut Formatter) -> Result {
-                let mut builder = f.debug_tuple("");
+                try!(write!(f, "("));
                 let ($(ref $name,)*) = *self;
                 let mut n = 0;
                 $(
-                    builder.field($name);
+                    if n > 0 {
+                        try!(write!(f, ", "));
+                    }
+                    try!(write!(f, "{:?}", *$name));
                     n += 1;
                 )*
-
                 if n == 1 {
-                    try!(write!(builder.formatter(), ","));
+                    try!(write!(f, ","));
                 }
-
-                builder.finish()
+                write!(f, ")")
             }
         }
         peel! { $($name,)* }

branches/tmp/src/libcore/fmt/mod.rs

@@ -1126,7 +1126,7 @@ macro_rules! uint_impl {
             acc
         }
 
-        /// Returns `true` if and only if `self == 2^k` for some `k`.
+        /// Returns `true` iff `self == 2^k` for some `k`.
         #[stable(feature = "rust1", since = "1.0.0")]
         #[inline]
         pub fn is_power_of_two(self) -> bool {

branches/tmp/src/libcore/num/mod.rs

@@ -46,7 +46,7 @@
 //!     // The division was valid
 //!     Some(x) => println!("Result: {}", x),
 //!     // The division was invalid
-//!     None    => println!("Cannot divide by 0"),
+//!     None    => println!("Cannot divide by 0")
 //! }
 //! ```
 //!
@@ -75,7 +75,7 @@
 //! fn check_optional(optional: &Option<Box<i32>>) {
 //!     match *optional {
 //!         Some(ref p) => println!("have value {}", p),
-//!         None => println!("have no value"),
+//!         None => println!("have no value")
 //!     }
 //! }
 //! ```
@@ -95,13 +95,13 @@
 //! // Take a reference to the contained string
 //! match msg {
 //!     Some(ref m) => println!("{}", *m),
-//!     None => (),
+//!     None => ()
 //! }
 //!
 //! // Remove the contained string, destroying the Option
 //! let unwrapped_msg = match msg {
 //!     Some(m) => m,
-//!     None => "default message",
+//!     None => "default message"
 //! };
 //! ```
 //!
@@ -137,7 +137,7 @@
 //!
 //! match name_of_biggest_animal {
 //!     Some(name) => println!("the biggest animal is {}", name),
-//!     None => println!("there are no animals :("),
+//!     None => println!("there are no animals :(")
 //! }
 //! ```
 
@@ -198,7 +198,7 @@ impl<T> Option<T> {
     pub fn is_some(&self) -> bool {
         match *self {
             Some(_) => true,
-            None => false,
+            None => false
         }
     }
 
@@ -244,7 +244,7 @@ impl<T> Option<T> {
     pub fn as_ref<'r>(&'r self) -> Option<&'r T> {
         match *self {
             Some(ref x) => Some(x),
-            None => None,
+            None => None
         }
     }
 
@@ -265,7 +265,7 @@ impl<T> Option<T> {
     pub fn as_mut<'r>(&'r mut self) -> Option<&'r mut T> {
         match *self {
             Some(ref mut x) => Some(x),
-            None => None,
+            None => None
         }
     }
 
@@ -376,7 +376,7 @@ impl<T> Option<T> {
     pub fn unwrap_or(self, def: T) -> T {
         match self {
             Some(x) => x,
-            None => def,
+            None => def
         }
     }
 
@@ -394,7 +394,7 @@ impl<T> Option<T> {
     pub fn unwrap_or_else<F: FnOnce() -> T>(self, f: F) -> T {
         match self {
             Some(x) => x,
-            None => f(),
+            None => f()
         }
     }
 
@@ -420,7 +420,7 @@ impl<T> Option<T> {
     pub fn map<U, F: FnOnce(T) -> U>(self, f: F) -> Option<U> {
         match self {
             Some(x) => Some(f(x)),
-            None => None,
+            None => None
         }
     }
 
@@ -464,7 +464,7 @@ impl<T> Option<T> {
     pub fn map_or_else<U, D: FnOnce() -> U, F: FnOnce(T) -> U>(self, default: D, f: F) -> U {
         match self {
             Some(t) => f(t),
-            None => default(),
+            None => default()
         }
     }
 
@@ -637,7 +637,7 @@ impl<T> Option<T> {
     pub fn or(self, optb: Option<T>) -> Option<T> {
         match self {
             Some(_) => self,
-            None => optb,
+            None => optb
         }
     }
 
@@ -659,7 +659,7 @@ impl<T> Option<T> {
     pub fn or_else<F: FnOnce() -> Option<T>>(self, f: F) -> Option<T> {
         match self {
             Some(_) => self,
-            None => f(),
+            None => f()
         }
     }
 
@@ -736,7 +736,7 @@ impl<T: Default> Option<T> {
     pub fn unwrap_or_default(self) -> T {
         match self {
             Some(x) => x,
-            None => Default::default(),
+            None => Default::default()
         }
     }
 }

branches/tmp/src/libcore/option.rs

@@ -960,100 +960,6 @@ pub mod types {
             }
         }
 
-        #[cfg(target_arch = "x86")]
-        pub mod arch {
-            pub mod c95 {
-                pub type c_char = i8;
-                pub type c_schar = i8;
-                pub type c_uchar = u8;
-                pub type c_short = i16;
-                pub type c_ushort = u16;
-                pub type c_int = i32;
-                pub type c_uint = u32;
-                pub type c_long = i32;
-                pub type c_ulong = u32;
-                pub type c_float = f32;
-                pub type c_double = f64;
-                pub type size_t = u32;
-                pub type ptrdiff_t = i32;
-                pub type clock_t = i32;
-                pub type time_t = i32;
-                pub type suseconds_t = i32;
-                pub type wchar_t = i32;
-            }
-            pub mod c99 {
-                pub type c_longlong = i64;
-                pub type c_ulonglong = u64;
-                pub type intptr_t = i32;
-                pub type uintptr_t = u32;
-                pub type intmax_t = i64;
-                pub type uintmax_t = u64;
-            }
-            pub mod posix88 {
-                pub type off_t = i64;
-                pub type dev_t = u32;
-                pub type ino_t = u32;
-                pub type pid_t = i32;
-                pub type uid_t = u32;
-                pub type gid_t = u32;
-                pub type useconds_t = u32;
-                pub type mode_t = u16;
-                pub type ssize_t = i32;
-            }
-            pub mod posix01 {
-                use types::common::c95::{c_void};
-                use types::common::c99::{uint8_t, uint32_t, int32_t};
-                use types::os::arch::c95::{c_long, time_t};
-                use types::os::arch::posix88::{dev_t, gid_t, ino_t};
-                use types::os::arch::posix88::{mode_t, off_t};
-                use types::os::arch::posix88::{uid_t};
-
-                pub type nlink_t = u16;
-                pub type blksize_t = i32;
-                pub type blkcnt_t = i64;
-                pub type fflags_t = u32;
-                #[repr(C)]
-                #[derive(Copy, Clone)] pub struct stat {
-                    pub st_dev: dev_t,
-                    pub st_ino: ino_t,
-                    pub st_mode: mode_t,
-                    pub st_nlink: nlink_t,
-                    pub st_uid: uid_t,
-                    pub st_gid: gid_t,
-                    pub st_rdev: dev_t,
-                    pub st_atime: time_t,
-                    pub st_atime_nsec: c_long,
-                    pub st_mtime: time_t,
-                    pub st_mtime_nsec: c_long,
-                    pub st_ctime: time_t,
-                    pub st_ctime_nsec: c_long,
-                    pub st_size: off_t,
-                    pub st_blocks: blkcnt_t,
-                    pub st_blksize: blksize_t,
-                    pub st_flags: fflags_t,
-                    pub st_gen: uint32_t,
-                    pub st_lspare: int32_t,
-                    pub st_birthtime: time_t,
-                    pub st_birthtime_nsec: c_long,
-                    pub __unused: [uint8_t; 2],
-                }
-
-                #[repr(C)]
-                #[derive(Copy, Clone)] pub struct utimbuf {
-                    pub actime: time_t,
-                    pub modtime: time_t,
-                }
-
-                pub type pthread_attr_t = *mut c_void;
-            }
-            pub mod posix08 {
-            }
-            pub mod bsd44 {
-            }
-            pub mod extra {
-            }
-        }
-
         #[cfg(target_arch = "x86_64")]
         pub mod arch {
             pub mod c95 {

branches/tmp/src/liblibc/lib.rs

@@ -791,8 +791,7 @@ trait Foo {
     fn bar(&self);
 }
 
-// we now declare a function which takes an object with Foo trait implemented
-// as parameter
+// we now declare a function which takes an object implementing the Foo trait
 fn some_func<T: Foo>(foo: T) {
     foo.bar();
 }
@@ -1006,7 +1005,7 @@ a compile-time constant.
 
 E0308: r##"
 This error occurs when the compiler was unable to infer the concrete type of a
-variable. It can occur for several cases, the most common of which is a
+variable. This error can occur for several cases, the most common of which is a
 mismatch in the expected type that the compiler inferred for a variable's
 initializing expression, and the actual type explicitly assigned to the
 variable.

branches/tmp/src/librustc/diagnostics.rs

@@ -368,7 +368,6 @@ impl Target {
             arm_linux_androideabi,
             aarch64_linux_android,
 
-            i686_unknown_freebsd,
             x86_64_unknown_freebsd,
 
             i686_unknown_dragonfly,