Skip to content

Commit

Permalink
Test fixes from rollup
Browse files Browse the repository at this point in the history
Closes rust-lang#14163 (Fix typos in rustc manpage)
Closes rust-lang#14161 (Add the patch number to version strings. Closes rust-lang#13289)
Closes rust-lang#14156 (rustdoc: Fix hiding implementations of traits)
Closes rust-lang#14152 (add shebang to scripts that have execute bit set)
Closes rust-lang#14150 (libcore: remove fails from slice.rs and remove duplicated length checking)
Closes rust-lang#14147 (Make ProcessOutput Eq, TotalEq, Clone)
Closes rust-lang#14142 (doc: updates rust manual (loop to continue))
Closes rust-lang#14141 (doc: Update the linkage documentation)
Closes rust-lang#14139 (Remove an unnecessary .move_iter().collect())
Closes rust-lang#14136 (Two minor fixes in parser.rs)
Closes rust-lang#14130 (Fixed typo in comments of driver.rs)
Closes rust-lang#14128 (Add `stat` method to `std::io::fs::File` to stat without a Path.)
Closes rust-lang#14114 (rustdoc: List macros in the sidebar)
Closes rust-lang#14113 (shootout-nbody improvement)
Closes rust-lang#14112 (Improved example code in Option)
Closes rust-lang#14104 (Remove reference to MutexArc)
Closes rust-lang#14087 (emacs: highlight `macro_name!` in macro invocations using [] delimiters)
  • Loading branch information
alexcrichton committed May 13, 2014
1 parent 13491db commit 5001a66
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion src/libstd/io/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1509,7 +1509,6 @@ pub enum FileType {
/// Err(e) => fail!("couldn't read foo.txt: {}", e),
/// };
///
/// println!("path: {}", info.path.display());
/// println!("byte size: {}", info.size);
/// # }
/// ```
Expand Down
3 changes: 1 addition & 2 deletions src/libstd/os.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,12 @@ pub fn getcwd() -> Path {

#[cfg(windows)]
pub mod win32 {
use iter::Iterator;
use libc::types::os::arch::extra::DWORD;
use libc;
use option::{None, Option, Expect};
use option;
use os::TMPBUF_SZ;
use slice::{MutableVector, ImmutableVector, OwnedVector};
use slice::{MutableVector, ImmutableVector};
use str::{StrSlice, StrAllocating};
use str;
use vec::Vec;
Expand Down

1 comment on commit 5001a66

@alexcrichton
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r+ p=10

Please sign in to comment.