diff options
| author | bors <bors@rust-lang.org> | 2014-11-20 23:02:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-20 23:02:01 +0000 |
| commit | 770378a313a573776b16237a46b75bafa49072c1 (patch) | |
| tree | bc86d4c35a881325d9b70edfdfe36f6f42bcf47b /src/libstd/sys | |
| parent | d13aff12246ab3c72b0c5f186400a21f825c0a6c (diff) | |
| parent | bc9de771d5f2ab71a0e3b0eb27a92c65e8ddd4b9 (diff) | |
auto merge of #18773 : subhashb/rust/convert_remaining_failures_to_panic, r=steveklabnik
I have also renamed `fail` to `panic` in some non-documentation comments, where I thought it mattered. Fixes #18677 cc @steveklabnik
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/windows/tty.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/windows/tty.rs b/src/libstd/sys/windows/tty.rs index 7d001e6394c..0e7b06cbb94 100644 --- a/src/libstd/sys/windows/tty.rs +++ b/src/libstd/sys/windows/tty.rs @@ -14,8 +14,8 @@ //! //! This module contains the implementation of a Windows specific console TTY. //! Also converts between UTF-16 and UTF-8. Windows has very poor support for -//! UTF-8 and some functions will fail. In particular ReadFile and ReadConsole -//! will fail when the codepage is set to UTF-8 and a Unicode character is +//! UTF-8 and some functions will panic. In particular ReadFile and ReadConsole +//! will panic when the codepage is set to UTF-8 and a Unicode character is //! entered. //! //! FIXME @@ -48,7 +48,7 @@ fn invalid_encoding() -> IoError { pub fn is_tty(fd: c_int) -> bool { let mut out: DWORD = 0; - // If this function doesn't fail then fd is a TTY + // If this function doesn't panic then fd is a TTY match unsafe { GetConsoleMode(get_osfhandle(fd) as HANDLE, &mut out as LPDWORD) } { 0 => false, |