Skip to content

Commit 5001a66

Browse files
committed
Test fixes from rollup
Closes #14163 (Fix typos in rustc manpage) Closes #14161 (Add the patch number to version strings. Closes #13289) Closes #14156 (rustdoc: Fix hiding implementations of traits) Closes #14152 (add shebang to scripts that have execute bit set) Closes #14150 (libcore: remove fails from slice.rs and remove duplicated length checking) Closes #14147 (Make ProcessOutput Eq, TotalEq, Clone) Closes #14142 (doc: updates rust manual (loop to continue)) Closes #14141 (doc: Update the linkage documentation) Closes #14139 (Remove an unnecessary .move_iter().collect()) Closes #14136 (Two minor fixes in parser.rs) Closes #14130 (Fixed typo in comments of driver.rs) Closes #14128 (Add `stat` method to `std::io::fs::File` to stat without a Path.) Closes #14114 (rustdoc: List macros in the sidebar) Closes #14113 (shootout-nbody improvement) Closes #14112 (Improved example code in Option) Closes #14104 (Remove reference to MutexArc) Closes #14087 (emacs: highlight `macro_name!` in macro invocations using [] delimiters)
1 parent 13491db commit 5001a66

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

src/libstd/io/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1509,7 +1509,6 @@ pub enum FileType {
15091509
/// Err(e) => fail!("couldn't read foo.txt: {}", e),
15101510
/// };
15111511
///
1512-
/// println!("path: {}", info.path.display());
15131512
/// println!("byte size: {}", info.size);
15141513
/// # }
15151514
/// ```

src/libstd/os.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,12 @@ pub fn getcwd() -> Path {
9595

9696
#[cfg(windows)]
9797
pub mod win32 {
98-
use iter::Iterator;
9998
use libc::types::os::arch::extra::DWORD;
10099
use libc;
101100
use option::{None, Option, Expect};
102101
use option;
103102
use os::TMPBUF_SZ;
104-
use slice::{MutableVector, ImmutableVector, OwnedVector};
103+
use slice::{MutableVector, ImmutableVector};
105104
use str::{StrSlice, StrAllocating};
106105
use str;
107106
use vec::Vec;

0 commit comments

Comments
 (0)