servo: Merge #5434 - Move to new io in util (from Ms2ger:util-old-io); r=jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: be255304af65ac6aa4d26ea214460073536b9b09
This commit is contained in:
Ms2ger 2015-03-28 13:07:06 -06:00
Родитель e09eea9082
Коммит 57cf222efe
3 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -2,8 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use std::old_io as io;
use std::old_io::Writer;
use std::io::{self, Write};
use std::mem;
use std::mem::size_of;
use std::slice;

Просмотреть файл

@ -10,7 +10,6 @@
#![feature(hash)]
#![feature(int_uint)]
#![feature(io)]
#![feature(old_io)]
#![feature(optin_builtin_traits)]
#![feature(path)]
#![cfg_attr(not(target_os = "android"), feature(path_ext))]

Просмотреть файл

@ -14,7 +14,7 @@ use getopts;
use std::collections::HashSet;
use std::cmp;
use std::env;
use std::old_io as io;
use std::io::{self, Write};
use std::mem;
use std::ptr;
use std::rt;
@ -156,7 +156,9 @@ pub fn print_debug_usage(app: &str) {
}
fn args_fail(msg: &str) {
io::stderr().write_line(msg).unwrap();
let mut stderr = io::stderr();
stderr.write_all(msg.as_bytes()).unwrap();
stderr.write_all(b"\n").unwrap();
env::set_exit_status(1);
}