about summary refs log tree commit diff
path: root/src/libstd/sys/windows
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-03-28 12:42:45 +0000
committerbors <bors@rust-lang.org>2015-03-28 12:42:45 +0000
commit3e7385aae9d58c8e12137d7c07aad48551048c13 (patch)
tree8da050722f9345ea690c8d0a05897013b6bef00d /src/libstd/sys/windows
parentf8b6e28e758231f611e8e7923aa607cebd150717 (diff)
parent95f4061c499fc2c908b4d38766813d8f649ec139 (diff)
downloadrust-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/sys/windows')
-rw-r--r--src/libstd/sys/windows/tty.rs2
1 files changed, 1 insertions, 1 deletions
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 {