---

yaml
---
r: 275123
b: refs/heads/stable
c: e77c79e
h: refs/heads/master
i:
  275121: f22afc9
  275119: 0541bb9

Author: nbaksalyar

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: e628398f3464ef4bb60c3a05006064e1633e3d6f
+refs/heads/stable: e77c79e96d600b9179b1697037e1c0a52558c8f2
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/liballoc/Cargo.toml

@@ -10,3 +10,5 @@ test = false
 
 [dependencies]
 core = { path = "../libcore" }
+libc = { path = "../rustc/libc_shim" }
+alloc_system = { path = "../liballoc_system" }

branches/stable/src/liballoc/lib.rs

@@ -92,9 +92,16 @@
 #![feature(unsafe_no_drop_flag, filling_drop)]
 #![feature(unsize)]
 
+// Issue# 30592: Systematically use alloc_system during stage0 since jemalloc
+// might be unavailable or disabled
+#![cfg_attr(stage0, feature(alloc_system))]
+
 #![cfg_attr(not(test), feature(raw, fn_traits, placement_new_protocol))]
 #![cfg_attr(test, feature(test, rustc_private, box_heap))]
 
+#[cfg(stage0)]
+extern crate alloc_system;
+
 // Allow testing this library
 
 #[cfg(test)]

branches/stable/src/liblibc

@@ -1 +1 @@
-Subproject commit 1b1eea2cdd77c63d73ba0b09b905a91910d1c992
+Subproject commit 403bdc88394919f297bdb365032044cc0481c319

branches/stable/src/librustc/Cargo.toml

@@ -17,7 +17,6 @@ graphviz = { path = "../libgraphviz" }
 log = { path = "../liblog" }
 rbml = { path = "../librbml" }
 rustc_back = { path = "../librustc_back" }
-rustc_bitflags = { path = "../librustc_bitflags" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_front = { path = "../librustc_front" }
 rustc_llvm = { path = "../librustc_llvm" }

branches/stable/src/librustc_back/target/x86_64_sun_solaris.rs

@@ -13,6 +13,7 @@ use target::Target;
 pub fn target() -> Target {
     let mut base = super::solaris_base::opts();
     base.pre_link_args.push("-m64".to_string());
+    base.cpu = "x86-64".to_string();
 
     Target {
         llvm_target: "x86_64-pc-solaris".to_string(),

branches/stable/src/librustc_bitflags/Cargo.toml

@@ -7,3 +7,6 @@ version = "0.0.0"
 name = "rustc_bitflags"
 path = "lib.rs"
 test = false
+
+[dependencies]
+core = { path = "../libcore" }

branches/stable/src/librustc_front/Cargo.toml

@@ -12,4 +12,3 @@ crate-type = ["dylib"]
 log = { path = "../liblog" }
 syntax = { path = "../libsyntax" }
 serialize = { path = "../libserialize" }
-rustc_bitflags = { path = "../librustc_bitflags" }

branches/stable/src/librustc_llvm/Cargo.toml

@@ -12,9 +12,6 @@ crate-type = ["dylib"]
 [features]
 static-libstdcpp = []
 
-[dependencies]
-rustc_bitflags = { path = "../librustc_bitflags" }
-
 [build-dependencies]
 build_helper = { path = "../build_helper" }
 gcc = "0.3"

branches/stable/src/librustc_metadata/Cargo.toml

@@ -14,7 +14,6 @@ log = { path = "../liblog" }
 rbml = { path = "../librbml" }
 rustc = { path = "../librustc" }
 rustc_back = { path = "../librustc_back" }
-rustc_bitflags = { path = "../librustc_bitflags" }
 rustc_front = { path = "../librustc_front" }
 rustc_llvm = { path = "../librustc_llvm" }
 serialize = { path = "../libserialize" }

branches/stable/src/librustc_plugin/Cargo.toml

@@ -11,7 +11,6 @@ crate-type = ["dylib"]
 [dependencies]
 log = { path = "../liblog" }
 rustc = { path = "../librustc" }
-rustc_bitflags = { path = "../librustc_bitflags" }
 rustc_front = { path = "../librustc_front" }
 rustc_metadata = { path = "../librustc_metadata" }
 rustc_mir = { path = "../librustc_mir" }

branches/stable/src/librustc_resolve/Cargo.toml

@@ -12,6 +12,5 @@ crate-type = ["dylib"]
 log = { path = "../liblog" }
 syntax = { path = "../libsyntax" }
 rustc = { path = "../librustc" }
-rustc_bitflags = { path = "../librustc_bitflags" }
 rustc_front = { path = "../librustc_front" }
 arena = { path = "../libarena" }

branches/stable/src/librustc_unicode/char.rs

@@ -776,13 +776,13 @@ impl char {
     /// Basic usage:
     ///
     /// ```
-    /// let c = 'C';
+    /// let c = 'c';
     ///
-    /// assert_eq!(c.to_lowercase().next(), Some('c'));
+    /// assert_eq!(c.to_uppercase().next(), Some('C'));
     ///
     /// // Japanese scripts do not have case, and so:
     /// let c = '山';
-    /// assert_eq!(c.to_lowercase().next(), Some('山'));
+    /// assert_eq!(c.to_uppercase().next(), Some('山'));
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]

branches/stable/src/libstd/Cargo.toml

@@ -18,6 +18,7 @@ collections = { path = "../libcollections" }
 core = { path = "../libcore" }
 libc = { path = "../rustc/libc_shim" }
 rand = { path = "../librand" }
+rustc_bitflags = { path = "../librustc_bitflags" }
 rustc_unicode = { path = "../librustc_unicode" }
 
 [build-dependencies]

branches/stable/src/libstd/lib.rs

@@ -269,10 +269,6 @@
 #![feature(vec_push_all)]
 #![feature(zero_one)]
 
-// Issue# 30592: Systematically use alloc_system during stage0 since jemalloc
-// might be unavailable or disabled
-#![cfg_attr(stage0, feature(alloc_system))]
-
 // Don't link to std. We are std.
 #![no_std]
 
@@ -299,9 +295,6 @@ extern crate alloc;
 extern crate rustc_unicode;
 extern crate libc;
 
-#[cfg(stage0)]
-extern crate alloc_system;
-
 // Make std testable by not duplicating lang items and other globals. See #2912
 #[cfg(test)] extern crate std as realstd;
 

branches/stable/src/libstd/os/netbsd/fs.rs

@@ -74,6 +74,8 @@ pub trait MetadataExt {
     fn st_flags(&self) -> u32;
     #[stable(feature = "metadata_ext2", since = "1.8.0")]
     fn st_gen(&self) -> u32;
+    #[stable(feature = "metadata_ext2", since = "1.8.0")]
+    fn st_spare(&self) -> u32;
 }
 
 #[stable(feature = "metadata_ext", since = "1.1.0")]
@@ -113,25 +115,25 @@ impl MetadataExt for Metadata {
         self.as_inner().as_inner().st_atime as i64
     }
     fn st_atime_nsec(&self) -> i64 {
-        self.as_inner().as_inner().st_atimensec as i64
+        self.as_inner().as_inner().st_atime_nsec as i64
     }
     fn st_mtime(&self) -> i64 {
         self.as_inner().as_inner().st_mtime as i64
     }
     fn st_mtime_nsec(&self) -> i64 {
-        self.as_inner().as_inner().st_mtimensec as i64
+        self.as_inner().as_inner().st_mtime_nsec as i64
     }
     fn st_ctime(&self) -> i64 {
         self.as_inner().as_inner().st_ctime as i64
     }
     fn st_ctime_nsec(&self) -> i64 {
-        self.as_inner().as_inner().st_ctimensec as i64
+        self.as_inner().as_inner().st_ctime_nsec as i64
     }
     fn st_birthtime(&self) -> i64 {
         self.as_inner().as_inner().st_birthtime as i64
     }
     fn st_birthtime_nsec(&self) -> i64 {
-        self.as_inner().as_inner().st_birthtimensec as i64
+        self.as_inner().as_inner().st_birthtime_nsec as i64
     }
     fn st_blksize(&self) -> u64 {
         self.as_inner().as_inner().st_blksize as u64
@@ -145,5 +147,8 @@ impl MetadataExt for Metadata {
     fn st_flags(&self) -> u32 {
         self.as_inner().as_inner().st_flags as u32
     }
+    fn st_spare(&self) -> u32 {
+        self.as_inner().as_inner().st_spare as u32
+    }
 }
 

branches/stable/src/libstd/os/solaris/fs.rs

@@ -73,7 +73,7 @@ impl MetadataExt for Metadata {
     #[allow(deprecated)]
     fn as_raw_stat(&self) -> &raw::stat {
         unsafe {
-            &*(self.as_inner().as_inner() as *const libc::stat64
+            &*(self.as_inner().as_inner() as *const libc::stat
                                           as *const raw::stat)
         }
     }

branches/stable/src/libstd/sys/unix/fs.rs

@@ -27,10 +27,7 @@ use sys_common::{AsInner, FromInner};
 
 #[cfg(target_os = "linux")]
 use libc::{stat64, fstat64, lstat64, off64_t, ftruncate64, lseek64, dirent64, readdir64_r, open64};
-#[cfg(target_os = "android")]
-use libc::{stat as stat64, fstat as fstat64, lstat as lstat64, off64_t, ftruncate64, lseek64,
-           dirent as dirent64, open as open64};
-#[cfg(not(any(target_os = "linux", target_os = "android")))]
+#[cfg(not(target_os = "linux"))]
 use libc::{stat as stat64, fstat as fstat64, lstat as lstat64, off_t as off64_t,
            ftruncate as ftruncate64, lseek as lseek64, dirent as dirent64, open as open64};
 #[cfg(not(any(target_os = "linux", target_os = "solaris")))]
@@ -122,31 +119,7 @@ impl FileAttr {
     }
 }
 
-#[cfg(target_os = "netbsd")]
-impl FileAttr {
-    pub fn modified(&self) -> io::Result<SystemTime> {
-        Ok(SystemTime::from(libc::timespec {
-            tv_sec: self.stat.st_mtime as libc::time_t,
-            tv_nsec: self.stat.st_mtimensec as libc::c_long,
-        }))
-    }
-
-    pub fn accessed(&self) -> io::Result<SystemTime> {
-        Ok(SystemTime::from(libc::timespec {
-            tv_sec: self.stat.st_atime as libc::time_t,
-            tv_nsec: self.stat.st_atimensec as libc::c_long,
-        }))
-    }
-
-    pub fn created(&self) -> io::Result<SystemTime> {
-        Ok(SystemTime::from(libc::timespec {
-            tv_sec: self.stat.st_birthtime as libc::time_t,
-            tv_nsec: self.stat.st_birthtimensec as libc::c_long,
-        }))
-    }
-}
-
-#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "netbsd")))]
+#[cfg(not(any(target_os = "ios", target_os = "macos")))]
 impl FileAttr {
     pub fn modified(&self) -> io::Result<SystemTime> {
         Ok(SystemTime::from(libc::timespec {

branches/stable/src/libstd/sys/unix/stack_overflow.rs

@@ -157,7 +157,8 @@ mod imp {
               target_os = "macos",
               target_os = "bitrig",
               target_os = "netbsd",
-              target_os = "openbsd"))]
+              target_os = "openbsd",
+              target_os = "solaris"))]
     unsafe fn get_stack() -> libc::stack_t {
         libc::stack_t { ss_sp: get_stackp(), ss_flags: 0, ss_size: SIGSTKSZ }
     }

branches/stable/src/libsyntax/Cargo.toml

@@ -9,7 +9,8 @@ path = "lib.rs"
 crate-type = ["dylib"]
 
 [dependencies]
+arena = { path = "../libarena" }
+fmt_macros = { path = "../libfmt_macros" }
 serialize = { path = "../libserialize" }
 term = { path = "../libterm" }
 log = { path = "../liblog" }
-rustc_bitflags = { path = "../librustc_bitflags" }

branches/stable/src/libterm/Cargo.toml

@@ -7,3 +7,6 @@ version = "0.0.0"
 name = "term"
 path = "lib.rs"
 crate-type = ["dylib", "rlib"]
+
+[dependencies]
+log = { path = "../liblog" }