Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Import the util crate as util rather than servo_util.

Browse source 
This used to conflict with the util crate from the standard library, which
has long since been removed.

The import in layout has not been changed because of a conflict with the
util mod there.
This commit is contained in:
Ms2ger 2015-01-29 12:16:41 +01:00
parent 221a343883
commit 505159a464
182 changed files with 294 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/servo/main.rs
View file

@ -11,7 +11,7 @@ extern crate libc;
extern crate servo;
extern crate time;
extern crate "util" as servo_util;
extern crate util;
#[cfg(all(feature = "glutin_app",not(test)))]
extern crate "glutin_app" as app;
@ -29,7 +29,7 @@ extern crate android_glue;
use libc::c_int;
#[cfg(not(test))]
use servo_util::opts;
use util::opts;
#[cfg(not(test))]
use servo::Browser;
@ -74,7 +74,7 @@ fn redirect_output(file_no: c_int) {
use libc::funcs::posix88::unistd::{pipe, dup2};
use libc::funcs::posix88::stdio::fdopen;
use libc::funcs::c95::stdio::fgets;
use servo_util::task::spawn_named;
use util::task::spawn_named;
use std::mem;
use std::ffi::CString;
use std::str::from_utf8;