remove unnecessary proc from resource loader factory

4 files changed, 35 insertions, 52 deletions

diff --git a/components/net/data_loader.rs b/components/net/data_loader.rs
index 5d9fb776674..0a33aa392c5 100644
--- a/components/net/data_loader.rs
+++ b/components/net/data_loader.rs
@@ -4,7 +4,7 @@
 
 use std::str;
 
-use resource_task::{Done, Payload, Metadata, LoadData, LoadResponse, LoaderTask, start_sending};
+use resource_task::{Done, Payload, Metadata, LoadData, LoadResponse, start_sending};
 
 use serialize::base64::FromBase64;
 
@@ -13,13 +13,12 @@ use http::headers::content_type::MediaType;
 use url::{percent_decode, NonRelativeSchemeData};
 
 
-pub fn factory() -> LoaderTask {
-    proc(url, start_chan) {
-        // NB: we don't spawn a new task.
-        // Hypothesis: data URLs are too small for parallel base64 etc. to be worth it.
-        // Should be tested at some point.
-        load(url, start_chan)
-    }
+pub fn factory(load_data: LoadData, start_chan: Sender<LoadResponse>) {
+    // NB: we don't spawn a new task.
+    // Hypothesis: data URLs are too small for parallel base64 etc. to be worth it.
+    // Should be tested at some point.
+    // Left in separate function to allow easy moving to a task, if desired.
+    load(url, start_chan)
 }
 
 fn load(load_data: LoadData, start_chan: Sender<LoadResponse>) {
diff --git a/components/net/file_loader.rs b/components/net/file_loader.rs
index 73a1d81cc27..c08f6f90ee8 100644
--- a/components/net/file_loader.rs
+++ b/components/net/file_loader.rs
@@ -2,7 +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 resource_task::{ProgressMsg, Metadata, Payload, Done, LoaderTask, start_sending};
+use resource_task::{ProgressMsg, Metadata, Payload, Done, start_sending};
 
 use std::io;
 use std::io::File;
@@ -29,30 +29,27 @@ fn read_all(reader: &mut io::Stream, progress_chan: &Sender<ProgressMsg>)
     }
 }
 
-pub fn factory() -> LoaderTask {
-    let f: LoaderTask = proc(load_data, start_chan) {
-        let url = load_data.url;
-        assert!("file" == url.scheme.as_slice());
-        let progress_chan = start_sending(start_chan, Metadata::default(url.clone()));
-        spawn_named("file_loader", proc() {
-            let file_path: Result<Path, ()> = url.to_file_path();
-            match file_path {
-                Ok(file_path) => {
-                    match File::open_mode(&Path::new(file_path), io::Open, io::Read) {
-                        Ok(ref mut reader) => {
-                            let res = read_all(reader as &mut io::Stream, &progress_chan);
-                            progress_chan.send(Done(res));
-                        }
-                        Err(e) => {
-                            progress_chan.send(Done(Err(e.desc.to_string())));
-                        }
+pub fn factory(load_data: LoadData, start_chan: Sender<LoadResponse>) {
+    let url = load_data.url;
+    assert!("file" == url.scheme.as_slice());
+    let progress_chan = start_sending(start_chan, Metadata::default(url.clone()));
+    spawn_named("file_loader", proc() {
+        let file_path: Result<Path, ()> = url.to_file_path();
+        match file_path {
+            Ok(file_path) => {
+                match File::open_mode(&Path::new(file_path), io::Open, io::Read) {
+                    Ok(ref mut reader) => {
+                        let res = read_all(reader as &mut io::Stream, &progress_chan);
+                        progress_chan.send(Done(res));
+                    }
+                    Err(e) => {
+                        progress_chan.send(Done(Err(e.desc.to_string())));
                     }
-                }
-                Err(_) => {
-                    progress_chan.send(Done(Err(url.to_string())));
                 }
             }
-        });
-    };
-    f
+            Err(_) => {
+                progress_chan.send(Done(Err(url.to_string())));
+            }
+        }
+    });
 }
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index c7cb56d4231..92b9692fda0 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -2,7 +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 resource_task::{Metadata, Payload, Done, LoadResponse, LoadData, LoaderTask, start_sending_opt};
+use resource_task::{Metadata, Payload, Done, LoadResponse, LoadData, start_sending_opt};
 
 use std::collections::hashmap::HashSet;
 use http::client::{RequestWriter, NetworkStream};
@@ -11,11 +11,8 @@ use std::io::Reader;
 use servo_util::task::spawn_named;
 use url::Url;
 
-pub fn factory() -> LoaderTask {
-    let f: LoaderTask = proc(url, start_chan) {
-        spawn_named("http_loader", proc() load(url, start_chan))
-    };
-    f
+pub fn factory(load_data: LoadData, start_chan: Sender<LoadResponse>) {
+    spawn_named("http_loader", proc() load(url, start_chan))
 }
 
 fn send_error(url: Url, err: String, start_chan: Sender<LoadResponse>) {
diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs
index bdc1c3f2339..281a727f50f 100644
--- a/components/net/resource_task.rs
+++ b/components/net/resource_task.rs
@@ -163,16 +163,6 @@ pub fn load_whole_resource(resource_task: &ResourceTask, url: Url)
 /// Handle to a resource task
 pub type ResourceTask = Sender<ControlMsg>;
 
-pub type LoaderTask = proc(load_data: LoadData, Sender<LoadResponse>);
-
-/**
-Creates a task to load a specific resource
-
-The ResourceManager delegates loading to a different type of loader task for
-each URL scheme
-*/
-type LoaderTaskFactory = extern "Rust" fn() -> LoaderTask;
-
 /// Create a ResourceTask
 pub fn new_resource_task() -> ResourceTask {
     let (setup_chan, setup_port) = channel();
@@ -213,9 +203,9 @@ impl ResourceManager {
 
     fn load(&self, mut load_data: LoadData, start_chan: Sender<LoadResponse>) {
         let loader = match load_data.url.scheme.as_slice() {
-            "file" => file_loader::factory(),
-            "http" | "https" => http_loader::factory(),
-            "data" => data_loader::factory(),
+            "file" => file_loader::factory,
+            "http" | "https" => http_loader::factory,
+            "data" => data_loader::factory,
             "about" => {
                 match load_data.url.non_relative_scheme_data().unwrap() {
                     "crash" => fail!("Loading the about:crash URL."),
@@ -225,7 +215,7 @@ impl ResourceManager {
                         path.pop();
                         path.push_many(["src", "test", "html", "failure.html"]);
                         load_data.url = Url::from_file_path(&path).unwrap();
-                        file_loader::factory()
+                        file_loader::factory
                     }
                     _ => {
                         start_sending(start_chan, Metadata::default(load_data.url))