diff options
| author | bors <bors@rust-lang.org> | 2015-03-28 12:42:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-28 12:42:45 +0000 |
| commit | 3e7385aae9d58c8e12137d7c07aad48551048c13 (patch) | |
| tree | 8da050722f9345ea690c8d0a05897013b6bef00d /src/libstd | |
| parent | f8b6e28e758231f611e8e7923aa607cebd150717 (diff) | |
| parent | 95f4061c499fc2c908b4d38766813d8f649ec139 (diff) | |
| download | rust-3e7385aae9d58c8e12137d7c07aad48551048c13.tar.gz rust-3e7385aae9d58c8e12137d7c07aad48551048c13.zip | |
Auto merge of #23806 - Manishearth:rollup, r=Manishearth
- Successful merges: #23332, #23751, #23788, #23803, #23804 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/hash/bench.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_io/net/addrinfo.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_io/tempfile.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/future.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/tty.rs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/collections/hash/bench.rs b/src/libstd/collections/hash/bench.rs index ca506e8c36f..ac21ae0f0aa 100644 --- a/src/libstd/collections/hash/bench.rs +++ b/src/libstd/collections/hash/bench.rs @@ -14,7 +14,7 @@ extern crate test; use prelude::v1::*; use self::test::Bencher; -use iter::{range_inclusive}; +use iter::range_inclusive; #[bench] fn new_drop(b : &mut Bencher) { diff --git a/src/libstd/old_io/net/addrinfo.rs b/src/libstd/old_io/net/addrinfo.rs index 0413a89ac4f..6237bb97f3e 100644 --- a/src/libstd/old_io/net/addrinfo.rs +++ b/src/libstd/old_io/net/addrinfo.rs @@ -20,7 +20,7 @@ pub use self::Flag::*; pub use self::Protocol::*; use iter::IteratorExt; -use old_io::{IoResult}; +use old_io::IoResult; use old_io::net::ip::{SocketAddr, IpAddr}; use option::Option; use option::Option::{Some, None}; diff --git a/src/libstd/old_io/tempfile.rs b/src/libstd/old_io/tempfile.rs index bf9b79ce65a..572cfa1395d 100644 --- a/src/libstd/old_io/tempfile.rs +++ b/src/libstd/old_io/tempfile.rs @@ -12,7 +12,7 @@ #![allow(deprecated)] // rand use env; -use iter::{IteratorExt}; +use iter::IteratorExt; use old_io::{fs, IoError, IoErrorKind, IoResult}; use old_io; use ops::Drop; diff --git a/src/libstd/sync/future.rs b/src/libstd/sync/future.rs index 3c7fecb7515..b2afe28fed4 100644 --- a/src/libstd/sync/future.rs +++ b/src/libstd/sync/future.rs @@ -38,7 +38,7 @@ use core::mem::replace; use self::FutureState::*; use sync::mpsc::{Receiver, channel}; -use thunk::{Thunk}; +use thunk::Thunk; use thread; /// A type encapsulating the result of a computation which may not be complete diff --git a/src/libstd/sys/windows/tty.rs b/src/libstd/sys/windows/tty.rs index 38faabf3276..791c7532bd0 100644 --- a/src/libstd/sys/windows/tty.rs +++ b/src/libstd/sys/windows/tty.rs @@ -42,7 +42,7 @@ use super::c::{ENABLE_INSERT_MODE, ENABLE_LINE_INPUT}; use super::c::{ENABLE_PROCESSED_INPUT, ENABLE_QUICK_EDIT_MODE}; use super::c::CONSOLE_SCREEN_BUFFER_INFO; use super::c::{ReadConsoleW, WriteConsoleW, GetConsoleMode, SetConsoleMode}; -use super::c::{GetConsoleScreenBufferInfo}; +use super::c::GetConsoleScreenBufferInfo; fn invalid_encoding() -> IoError { IoError { |
