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 net as net rather than servo_net.

Browse source
This commit is contained in:
Ms2ger 2015-02-10 12:16:11 +01:00
parent 29d3b872de
commit a09a912178
30 changed files with 56 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/servo/lib.rs
View file

@ -12,7 +12,7 @@ extern crate log;
extern crate compositing;
extern crate devtools;
extern crate "net" as servo_net;
extern crate net;
extern crate msg;
#[macro_use]
extern crate util;
@ -35,11 +35,11 @@ use msg::constellation_msg::ConstellationChan;
use script::dom::bindings::codegen::RegisterBindings;
#[cfg(not(test))]
use servo_net::image_cache_task::ImageCacheTask;
use net::image_cache_task::ImageCacheTask;
#[cfg(not(test))]
use servo_net::resource_task::new_resource_task;
use net::resource_task::new_resource_task;
#[cfg(not(test))]
use servo_net::storage_task::{StorageTaskFactory, StorageTask};
use net::storage_task::{StorageTaskFactory, StorageTask};
#[cfg(not(test))]
use gfx::font_cache_task::FontCacheTask;
#[cfg(not(test))]

4
components/servo/main.rs
View file

@ -10,7 +10,7 @@ extern crate libc;
extern crate servo;
extern crate time;
extern crate util;
extern crate "net" as servo_net;
extern crate net;
#[cfg(not(test))]
extern crate "glutin_app" as app;
@ -29,7 +29,7 @@ use libc::c_int;
use util::opts;
#[cfg(not(test))]
use servo_net::resource_task;
use net::resource_task;
#[cfg(not(test))]
use servo::Browser;