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

Use Vec for ResourceTask.

Browse source
This commit is contained in:
Ms2ger 2014-05-06 20:46:54 +02:00
parent 54499536d9
commit 605e09b449
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/net/resource_task.rs
View file

@ -126,15 +126,15 @@ type LoaderTaskFactory = extern "Rust" fn() -> LoaderTask;
/// Create a ResourceTask with the default loaders /// Create a ResourceTask with the default loaders
pub fn ResourceTask() -> ResourceTask { pub fn ResourceTask() -> ResourceTask {
let loaders = ~[ let loaders = vec!(
("file".to_owned(), file_loader::factory), ("file".to_owned(), file_loader::factory),
("http".to_owned(), http_loader::factory), ("http".to_owned(), http_loader::factory),
("data".to_owned(), data_loader::factory), ("data".to_owned(), data_loader::factory),
]; );
create_resource_task_with_loaders(loaders) create_resource_task_with_loaders(loaders)
} }
fn create_resource_task_with_loaders(loaders: ~[(~str, LoaderTaskFactory)]) -> ResourceTask { fn create_resource_task_with_loaders(loaders: Vec<(~str, LoaderTaskFactory)>) -> ResourceTask {
let (setup_chan, setup_port) = channel(); let (setup_chan, setup_port) = channel();
let builder = task::task().named("ResourceManager"); let builder = task::task().named("ResourceManager");
builder.spawn(proc() { builder.spawn(proc() {
@ -148,12 +148,12 @@ fn create_resource_task_with_loaders(loaders: ~[(~str, LoaderTaskFactory)]) -> R
struct ResourceManager { struct ResourceManager {
from_client: Receiver<ControlMsg>, from_client: Receiver<ControlMsg>,
/// Per-scheme resource loaders /// Per-scheme resource loaders
loaders: ~[(~str, LoaderTaskFactory)], loaders: Vec<(~str, LoaderTaskFactory)>,
} }
fn ResourceManager(from_client: Receiver<ControlMsg>, fn ResourceManager(from_client: Receiver<ControlMsg>,
loaders: ~[(~str, LoaderTaskFactory)]) -> ResourceManager { loaders: Vec<(~str, LoaderTaskFactory)>) -> ResourceManager {
ResourceManager { ResourceManager {
from_client : from_client, from_client : from_client,
loaders : loaders, loaders : loaders,
@ -236,7 +236,7 @@ fn snicklefritz_loader_factory() -> LoaderTask {
#[test] #[test]
fn should_delegate_to_scheme_loader() { fn should_delegate_to_scheme_loader() {
let loader_factories = ~[("snicklefritz".to_owned(), snicklefritz_loader_factory)]; let loader_factories = vec!(("snicklefritz".to_owned(), snicklefritz_loader_factory));
let resource_task = create_resource_task_with_loaders(loader_factories); let resource_task = create_resource_task_with_loaders(loader_factories);
let (start_chan, start) = channel(); let (start_chan, start) = channel();
resource_task.send(Load(FromStr::from_str("snicklefritz://heya").unwrap(), start_chan)); resource_task.send(Load(FromStr::from_str("snicklefritz://heya").unwrap(), start_chan));