Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 22:45:34 +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

2
components/net/about_loader.rs
View file

@ -8,7 +8,7 @@ use file_loader;
use url::Url;
use hyper::http::RawStatus;
use servo_util::resource_files::resources_dir_path;
use util::resource_files::resources_dir_path;
use std::borrow::ToOwned;
use std::io::fs::PathExtensions;

2
components/net/file_loader.rs
View file

@ -9,7 +9,7 @@ use std::borrow::ToOwned;
use std::io;
use std::io::File;
use std::sync::mpsc::Sender;
use servo_util::task::spawn_named;
use util::task::spawn_named;
static READ_SIZE: uint = 8192;

2
components/net/http_loader.rs
View file

@ -14,7 +14,7 @@ use hyper::status::StatusClass;
use std::error::Error;
use std::io::Reader;
use std::sync::mpsc::Sender;
use servo_util::task::spawn_named;
use util::task::spawn_named;
use url::{Url, UrlParser};
use std::borrow::ToOwned;

6
components/net/image_cache_task.rs
View file

@ -7,8 +7,8 @@ use resource_task;
use resource_task::{LoadData, ResourceTask};
use resource_task::ProgressMsg::{Payload, Done};
use servo_util::task::spawn_named;
use servo_util::taskpool::TaskPool;
use util::task::spawn_named;
use util::taskpool::TaskPool;
use std::borrow::ToOwned;
use std::collections::HashMap;
use std::collections::hash_map::Entry::{Occupied, Vacant};
@ -484,7 +484,7 @@ mod tests {
use resource_task::ProgressMsg::{Payload, Done};
use sniffer_task;
use image::base::test_image_bin;
use servo_util::taskpool::TaskPool;
use util::taskpool::TaskPool;
use std::sync::mpsc::{Sender, channel, Receiver};
use url::Url;

2
components/net/lib.rs
View file

@ -18,7 +18,7 @@ extern crate png;
#[macro_use]
extern crate log;
extern crate serialize;
extern crate "util" as servo_util;
extern crate util;
extern crate stb_image;
extern crate time;
extern crate url;

2
components/net/local_image_cache.rs
View file

@ -14,7 +14,7 @@ use std::borrow::ToOwned;
use std::collections::HashMap;
use std::collections::hash_map::Entry::{Occupied, Vacant};
use std::sync::mpsc::{Receiver, channel};
use servo_util::task::spawn_named;
use util::task::spawn_named;
use url::Url;
pub trait ImageResponder<NodeAddress: Send> {

2
components/net/resource_task.rs
View file

@ -11,7 +11,7 @@ use http_loader;
use sniffer_task;
use sniffer_task::SnifferTask;
use servo_util::task::spawn_named;
use util::task::spawn_named;
use hyper::header::common::UserAgent;
use hyper::header::Headers;

4
components/net/storage_task.rs
View file

@ -8,8 +8,8 @@ use std::collections::BTreeMap;
use std::sync::mpsc::{channel, Receiver, Sender};
use url::Url;
use servo_util::str::DOMString;
use servo_util::task::spawn_named;
use util::str::DOMString;
use util::task::spawn_named;
/// Request operations on the storage data associated with a particular url
pub enum StorageTaskMsg {