bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Simplify Windows stdout/stderr

Browse source
This commit is contained in:
Oliver Middleton 2016-03-10 23:59:28 +00:00
parent 8427efaab3
commit 6993939242
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstd/sys/windows/stdio.rs
View file

@ -69,8 +69,7 @@ fn write(out: &Output, data: &[u8]) -> io::Result<usize> {
// [1]: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1232 // [1]: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1232
// [2]: http://www.mail-archive.com/log4net-dev@logging.apache.org/msg00661.html // [2]: http://www.mail-archive.com/log4net-dev@logging.apache.org/msg00661.html
const OUT_MAX: usize = 8192; const OUT_MAX: usize = 8192;
let data_len; let (utf16, data_len) = match str::from_utf8(data).ok() {
let utf16 = match str::from_utf8(data).ok() {
Some(mut utf8) => { Some(mut utf8) => {
if utf8.len() > OUT_MAX { if utf8.len() > OUT_MAX {
let mut new_len = OUT_MAX; let mut new_len = OUT_MAX;
@ -79,8 +78,7 @@ fn write(out: &Output, data: &[u8]) -> io::Result<usize> {
} }
utf8 = &utf8[..new_len]; utf8 = &utf8[..new_len];
} }
data_len = utf8.len(); (utf8.encode_utf16().collect::<Vec<u16>>(), utf8.len())
utf8.encode_utf16().collect::<Vec<u16>>()
} }
None => return Err(invalid_encoding()), None => return Err(invalid_encoding()),
}; };