Backport accepted PRs to beta

RELEASES.md

@@ -1,3 +1,21 @@
+Version 1.1.0 (July 2015)
+========================
+
+* NNNN changes, numerous bugfixes
+
+Libraries
+---------
+
+* The [`std::fs` module has been expanded][fs-expand] to expand the set of
+  functionality exposed:
+  * `DirEntry` now supports optimizations like `file_type` and `metadata` which
+    don't incur a syscall on some platforms.
+  * A `symlink_metadata` function has been added.
+  * The `fs::Metadata` structure now lowers to its OS counterpart, providing
+    access to all underlying information.
+
+[fs-expand]: https://github.com/rust-lang/rust/pull/25844
+
 Version 1.0.0 (May 2015)
 ========================
 

configure

@@ -593,6 +593,7 @@ valopt musl-root "/usr/local" "MUSL root installation directory"
 opt_nosave manage-submodules 1 "let the build manage the git submodules"
 opt_nosave clang 0 "prefer clang to gcc for building the runtime"
 opt_nosave jemalloc 1 "build liballoc with jemalloc"
+opt elf-tls 1 "elf thread local storage on platforms where supported"
 
 valopt_nosave prefix "/usr/local" "set installation prefix"
 valopt_nosave local-rust-root "/usr/local" "set prefix for local rust binary"

mk/crates.mk

@@ -153,3 +153,7 @@ TOOL_INPUTS_$(1) := $$(call rwildcard,$$(dir $$(TOOL_SOURCE_$(1))),*.rs)
 endef
 
 $(foreach crate,$(TOOLS),$(eval $(call RUST_TOOL,$(crate))))
+
+ifdef CFG_DISABLE_ELF_TLS
+RUSTFLAGS_std := --cfg no_elf_tls
+endif

src/libcollections/borrow.rs

@@ -21,7 +21,7 @@ use core::ops::Deref;
 use core::option::Option;
 
 use fmt;
-use alloc::{rc, arc};
+use alloc::{boxed, rc, arc};
 
 use self::Cow::*;
 
@@ -116,6 +116,14 @@ impl<'a, T: ?Sized> BorrowMut<T> for &'a mut T {
     fn borrow_mut(&mut self) -> &mut T { &mut **self }
 }
 
+impl<T: ?Sized> Borrow<T> for boxed::Box<T> {
+    fn borrow(&self) -> &T { &**self }
+}
+
+impl<T: ?Sized> BorrowMut<T> for boxed::Box<T> {
+    fn borrow_mut(&mut self) -> &mut T { &mut **self }
+}
+
 impl<T> Borrow<T> for rc::Rc<T> {
     fn borrow(&self) -> &T { &**self }
 }

src/libcollectionstest/btree/map.rs

@@ -12,6 +12,7 @@ use std::collections::BTreeMap;
 use std::collections::Bound::{Excluded, Included, Unbounded, self};
 use std::collections::btree_map::Entry::{Occupied, Vacant};
 use std::iter::range_inclusive;
+use std::rc::Rc;
 
 #[test]
 fn test_basic_large() {
@@ -198,6 +199,34 @@ fn test_range() {
     }
 }
 
+#[test]
+fn test_borrow() {
+    // make sure these compile -- using the Borrow trait
+    {
+        let mut map = BTreeMap::new();
+        map.insert("0".to_string(), 1);
+        assert_eq!(map["0"], 1);
+    }
+
+    {
+        let mut map = BTreeMap::new();
+        map.insert(Box::new(0), 1);
+        assert_eq!(map[&0], 1);
+    }
+
+    {
+        let mut map = BTreeMap::new();
+        map.insert(Box::new([0, 1]) as Box<[i32]>, 1);
+        assert_eq!(map[&[0, 1][..]], 1);
+    }
+
+    {
+        let mut map = BTreeMap::new();
+        map.insert(Rc::new(0), 1);
+        assert_eq!(map[&0], 1);
+    }
+}
+
 #[test]
 fn test_entry(){
     let xs = [(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)];

src/librustc_trans/lib.rs

@@ -37,7 +37,6 @@
 #![feature(staged_api)]
 #![feature(unicode)]
 #![feature(path_ext)]
-#![feature(fs)]
 #![feature(path_relative_from)]
 
 #![allow(trivial_casts)]

src/libstd/fs.rs

@@ -148,7 +148,7 @@ pub struct OpenOptions(fs_imp::OpenOptions);
 pub struct Permissions(fs_imp::FilePermissions);
 
 /// An structure representing a type of file with accessors for each file type.
-#[unstable(feature = "file_type", reason = "recently added API")]
+#[stable(feature = "file_type", since = "1.1.0")]
 #[derive(Copy, Clone, PartialEq, Eq, Hash)]
 pub struct FileType(fs_imp::FileType);
 
@@ -208,14 +208,6 @@ impl File {
         OpenOptions::new().write(true).create(true).truncate(true).open(path)
     }
 
-    /// Returns `None`.
-    #[unstable(feature = "file_path",
-               reason = "this abstraction was imposed by this library and was removed")]
-    #[deprecated(since = "1.0.0", reason = "abstraction was removed")]
-    pub fn path(&self) -> Option<&Path> {
-        None
-    }
-
     /// Attempts to sync all OS-internal metadata to disk.
     ///
     /// This function will attempt to ensure that all in-core data reaches the
@@ -501,7 +493,7 @@ impl AsInnerMut<fs_imp::OpenOptions> for OpenOptions {
 
 impl Metadata {
     /// Returns the file type for this metadata.
-    #[unstable(feature = "file_type", reason = "recently added API")]
+    #[stable(feature = "file_type", since = "1.1.0")]
     pub fn file_type(&self) -> FileType {
         FileType(self.0.file_type())
     }
@@ -575,38 +567,6 @@ impl Metadata {
     pub fn permissions(&self) -> Permissions {
         Permissions(self.0.perm())
     }
-
-    /// Returns the most recent access time for a file.
-    ///
-    /// The return value is in milliseconds since the epoch.
-    #[unstable(feature = "fs_time",
-               reason = "the return type of u64 is not quite appropriate for \
-                         this method and may change if the standard library \
-                         gains a type to represent a moment in time")]
-    #[deprecated(since = "1.1.0",
-                 reason = "use os::platform::fs::MetadataExt extension traits")]
-    pub fn accessed(&self) -> u64 {
-        self.adjust_time(self.0.accessed())
-    }
-
-    /// Returns the most recent modification time for a file.
-    ///
-    /// The return value is in milliseconds since the epoch.
-    #[unstable(feature = "fs_time",
-               reason = "the return type of u64 is not quite appropriate for \
-                         this method and may change if the standard library \
-                         gains a type to represent a moment in time")]
-    #[deprecated(since = "1.1.0",
-                 reason = "use os::platform::fs::MetadataExt extension traits")]
-    pub fn modified(&self) -> u64 {
-        self.adjust_time(self.0.modified())
-    }
-
-    fn adjust_time(&self, val: u64) -> u64 {
-        // FILETIME (what `val` represents) is in 100ns intervals and there are
-        // 10000 intervals in a millisecond.
-        if cfg!(windows) {val / 10000} else {val}
-    }
 }
 
 impl AsInner<fs_imp::FileAttr> for Metadata {
@@ -663,15 +623,17 @@ impl Permissions {
     }
 }
 
-#[unstable(feature = "file_type", reason = "recently added API")]
 impl FileType {
     /// Test whether this file type represents a directory.
+    #[stable(feature = "file_type", since = "1.1.0")]
     pub fn is_dir(&self) -> bool { self.0.is_dir() }
 
     /// Test whether this file type represents a regular file.
+    #[stable(feature = "file_type", since = "1.1.0")]
     pub fn is_file(&self) -> bool { self.0.is_file() }
 
     /// Test whether this file type represents a symbolic link.
+    #[stable(feature = "file_type", since = "1.1.0")]
     pub fn is_symlink(&self) -> bool { self.0.is_symlink() }
 }
 
@@ -736,7 +698,7 @@ impl DirEntry {
     /// On Windows this function is cheap to call (no extra system calls
     /// needed), but on Unix platforms this function is the equivalent of
     /// calling `symlink_metadata` on the path.
-    #[unstable(feature = "dir_entry_ext", reason = "recently added API")]
+    #[stable(feature = "dir_entry_ext", since = "1.1.0")]
     pub fn metadata(&self) -> io::Result<Metadata> {
         self.0.metadata().map(Metadata)
     }
@@ -751,14 +713,14 @@ impl DirEntry {
     /// On Windows and most Unix platforms this function is free (no extra
     /// system calls needed), but some Unix platforms may require the equivalent
     /// call to `symlink_metadata` to learn about the target file type.
-    #[unstable(feature = "dir_entry_ext", reason = "recently added API")]
+    #[stable(feature = "dir_entry_ext", since = "1.1.0")]
     pub fn file_type(&self) -> io::Result<FileType> {
         self.0.file_type().map(FileType)
     }
 
     /// Returns the bare file name of this directory entry without any other
     /// leading path component.
-    #[unstable(feature = "dir_entry_ext", reason = "recently added API")]
+    #[stable(feature = "dir_entry_ext", since = "1.1.0")]
     pub fn file_name(&self) -> OsString {
         self.0.file_name()
     }
@@ -828,7 +790,6 @@ pub fn metadata<P: AsRef<Path>>(path: P) -> io::Result<Metadata> {
 /// # Examples
 ///
 /// ```rust
-/// #![feature(symlink_metadata)]
 /// # fn foo() -> std::io::Result<()> {
 /// use std::fs;
 ///
@@ -837,7 +798,7 @@ pub fn metadata<P: AsRef<Path>>(path: P) -> io::Result<Metadata> {
 /// # Ok(())
 /// # }
 /// ```
-#[unstable(feature = "symlink_metadata", reason = "recently added API")]
+#[stable(feature = "symlink_metadata", since = "1.1.0")]
 pub fn symlink_metadata<P: AsRef<Path>>(path: P) -> io::Result<Metadata> {
     fs_imp::lstat(path.as_ref()).map(Metadata)
 }
@@ -1268,7 +1229,6 @@ pub fn set_file_times<P: AsRef<Path>>(path: P, accessed: u64,
 /// # Examples
 ///
 /// ```
-/// # #![feature(fs)]
 /// # fn foo() -> std::io::Result<()> {
 /// use std::fs;
 ///
@@ -1284,14 +1244,13 @@ pub fn set_file_times<P: AsRef<Path>>(path: P, accessed: u64,
 /// This function will return an error if the provided `path` doesn't exist, if
 /// the process lacks permissions to change the attributes of the file, or if
 /// some other I/O error is encountered.
-#[unstable(feature = "fs",
-           reason = "a more granual ability to set specific permissions may \
-                     be exposed on the Permissions structure itself and this \
-                     method may not always exist")]
-pub fn set_permissions<P: AsRef<Path>>(path: P, perm: Permissions) -> io::Result<()> {
+#[stable(feature = "set_permissions", since = "1.1.0")]
+pub fn set_permissions<P: AsRef<Path>>(path: P, perm: Permissions)
+                                       -> io::Result<()> {
     fs_imp::set_perm(path.as_ref(), perm.0)
 }
 
+#[unstable(feature = "dir_builder", reason = "recently added API")]
 impl DirBuilder {
     /// Creates a new set of options with default mode/security settings for all
     /// platforms and also non-recursive.
@@ -2064,9 +2023,24 @@ mod tests {
         // These numbers have to be bigger than the time in the day to account
         // for timezones Windows in particular will fail in certain timezones
         // with small enough values
-        check!(fs::set_file_times(&path, 100000, 200000));
-        assert_eq!(check!(path.metadata()).accessed(), 100000);
-        assert_eq!(check!(path.metadata()).modified(), 200000);
+        check!(fs::set_file_times(&path, 100_000, 200_000));
+
+        check(&check!(path.metadata()));
+
+        #[cfg(unix)]
+        fn check(metadata: &fs::Metadata) {
+            use os::unix::prelude::*;
+            assert_eq!(metadata.atime(), 100);
+            assert_eq!(metadata.atime_nsec(), 0);
+            assert_eq!(metadata.mtime(), 200);
+            assert_eq!(metadata.mtime_nsec(), 0);
+        }
+        #[cfg(windows)]
+        fn check(metadata: &fs::Metadata) {
+            use os::windows::prelude::*;
+            assert_eq!(metadata.last_access_time(), 100_000 * 10_000);
+            assert_eq!(metadata.last_write_time(), 200_000 * 10_000);
+        }
     }
 
     #[test]

src/libstd/os/android/mod.rs

@@ -10,10 +10,11 @@
 
 //! Android-specific definitions
 
-#![unstable(feature = "raw_ext", reason = "recently added API")]
+#![stable(feature = "raw_ext", since = "1.1.0")]
 
 pub mod raw;
 
 pub mod fs {
+    #![stable(feature = "raw_ext", since = "1.1.0")]
     pub use sys::fs::MetadataExt;
 }

src/libstd/os/android/raw.rs

@@ -10,37 +10,67 @@
 
 //! Android-specific raw type definitions
 
+#![stable(feature = "raw_ext", since = "1.1.0")]
+
 use os::raw::{c_uint, c_uchar, c_ulonglong, c_longlong, c_ulong};
 use os::unix::raw::{uid_t, gid_t};
 
+#[stable(feature = "raw_ext", since = "1.1.0")]
 pub type blkcnt_t = u32;
+#[stable(feature = "raw_ext", since = "1.1.0")]
 pub type blksize_t = u32;
+#[stable(feature = "raw_ext", since = "1.1.0")]
 pub type dev_t = u32;
+#[stable(feature = "raw_ext", since = "1.1.0")]
 pub type ino_t = u32;
+#[stable(feature = "raw_ext", since = "1.1.0")]
 pub type mode_t = u16;
+#[stable(feature = "raw_ext", since = "1.1.0")]
 pub type nlink_t = u16;
+#[stable(feature = "raw_ext", since = "1.1.0")]
 pub type off_t = i32;
+#[stable(feature = "raw_ext", since = "1.1.0")]
 pub type time_t = i32;
 
 #[repr(C)]
+#[stable(feature = "raw_ext", since = "1.1.0")]
 pub struct stat {
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_dev: c_ulonglong,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub __pad0: [c_uchar; 4],
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub __st_ino: ino_t,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_mode: c_uint,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_nlink: c_uint,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_uid: uid_t,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_gid: gid_t,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_rdev: c_ulonglong,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub __pad3: [c_uchar; 4],
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_size: c_longlong,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_blksize: blksize_t,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_blocks: c_ulonglong,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_atime: time_t,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_atime_nsec: c_ulong,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_mtime: time_t,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_mtime_nsec: c_ulong,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_ctime: time_t,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_ctime_nsec: c_ulong,
+    #[stable(feature = "raw_ext", since = "1.1.0")]
     pub st_ino: c_ulonglong,
 }

src/libstd/os/bitrig/mod.rs

@@ -10,10 +10,11 @@
 
 //! Bitrig-specific definitions
 
-#![unstable(feature = "raw_ext", reason = "recently added API")]
+#![stable(feature = "raw_ext", since = "1.1.0")]
 
 pub mod raw;
 
 pub mod fs {
+    #![stable(feature = "raw_ext", since = "1.1.0")]
     pub use sys::fs::MetadataExt;
 }