6 files changed, 13 insertions, 11 deletions
diff --git a/src/components/net/file_loader.rs b/src/components/net/file_loader.rs
index 67690b6547a..4a63ac5dcf0 100644
--- a/src/components/net/file_loader.rs
+++ b/src/components/net/file_loader.rs
@@ -7,6 +7,7 @@ use servo_util::io::result;
 
 use std::io;
 use std::io::File;
+use servo_util::task::spawn_named;
 
 static READ_SIZE: uint = 1024;
 
@@ -30,7 +31,7 @@ pub fn factory() -> LoaderTask {
     let f: LoaderTask = proc(url, start_chan) {
         assert!("file" == url.scheme);
         let progress_chan = start_sending(start_chan, Metadata::default(url.clone()));
-        spawn(proc() {
+        spawn_named("file_loader", proc() {
             // ignore_io_error causes us to get None instead of a task failure.
             let _guard = io::ignore_io_error();
             match File::open_mode(&Path::new(url.path), io::Open, io::Read) {
diff --git a/src/components/net/http_loader.rs b/src/components/net/http_loader.rs
index 79b34778245..386d7d814f2 100644
--- a/src/components/net/http_loader.rs
+++ b/src/components/net/http_loader.rs
@@ -10,10 +10,11 @@ use http::client::RequestWriter;
 use http::method::Get;
 use http::headers::HeaderEnum;
 use std::io::Reader;
+use servo_util::task::spawn_named;
 
 pub fn factory() -> LoaderTask {
     let f: LoaderTask = proc(url, start_chan) {
-        spawn(proc() load(url, start_chan))
+        spawn_named("http_loader", proc() load(url, start_chan))
     };
     f
 }
diff --git a/src/components/net/image_cache_task.rs b/src/components/net/image_cache_task.rs
index 8a99ccf4a2c..886eb10a681 100644
--- a/src/components/net/image_cache_task.rs
+++ b/src/components/net/image_cache_task.rs
@@ -492,7 +492,7 @@ mod tests {
     use servo_util::url::make_url;
 
     fn mock_resource_task(on_load: proc(resource: SharedChan<resource_task::ProgressMsg>)) -> ResourceTask {
-        spawn_listener(proc(port: Port<resource_task::ControlMsg>) {
+        spawn_listener("mock_resource_task", proc(port: Port<resource_task::ControlMsg>) {
             loop {
                 match port.recv() {
                     resource_task::Load(_, response) => {
@@ -658,7 +658,7 @@ mod tests {
 
         let (resource_task_exited, resource_task_exited_chan) = Chan::new();
 
-        let mock_resource_task = spawn_listener(proc(port: Port<resource_task::ControlMsg>) {
+        let mock_resource_task = spawn_listener("should_not...already_available", proc(port: Port<resource_task::ControlMsg>) {
             loop {
                 match port.recv() {
                     resource_task::Load(_, response) => {
@@ -701,7 +701,7 @@ mod tests {
 
         let (resource_task_exited, resource_task_exited_chan) = Chan::new();
 
-        let mock_resource_task = spawn_listener(proc(port: Port<resource_task::ControlMsg>) {
+        let mock_resource_task = spawn_listener("should_not...already_failed", proc(port: Port<resource_task::ControlMsg>) {
             loop {
                 match port.recv() {
                     resource_task::Load(_, response) => {
diff --git a/src/components/net/local_image_cache.rs b/src/components/net/local_image_cache.rs
index f6dd537e47f..8bbe56e03aa 100644
--- a/src/components/net/local_image_cache.rs
+++ b/src/components/net/local_image_cache.rs
@@ -12,9 +12,9 @@ use image_cache_task::{Decode, GetImage, ImageCacheTask, ImageFailed, ImageNotRe
 use image_cache_task::{ImageResponseMsg, Prefetch, WaitForImage};
 
 use std::comm::Port;
-use std::task;
 use servo_util::url::{UrlMap, url_map};
 use extra::url::Url;
+use servo_util::task::spawn_named;
 
 pub trait ImageResponder {
     fn respond(&self) -> proc(ImageResponseMsg);
@@ -126,7 +126,7 @@ impl LocalImageCache {
                 assert!(self.on_image_available.is_some());
                 let on_image_available = self.on_image_available.as_ref().unwrap().respond();
                 let url = (*url).clone();
-                do task::spawn {
+                do spawn_named("LocalImageCache") {
                     let (response_port, response_chan) = Chan::new();
                     image_cache_task.send(WaitForImage(url.clone(), response_chan));
                     on_image_available(response_port.recv());
diff --git a/src/components/net/resource_task.rs b/src/components/net/resource_task.rs
index 53d5c3ea5ba..2513d610e52 100644
--- a/src/components/net/resource_task.rs
+++ b/src/components/net/resource_task.rs
@@ -135,7 +135,7 @@ pub fn ResourceTask() -> ResourceTask {
 }
 
 fn create_resource_task_with_loaders(loaders: ~[(~str, LoaderTaskFactory)]) -> ResourceTask {
-    let chan = spawn_listener(proc(from_client) {
+    let chan = spawn_listener("ResourceManager", proc(from_client) {
         // TODO: change copy to move once we can move out of closures
         ResourceManager(from_client, loaders).start()
     });
diff --git a/src/components/net/util.rs b/src/components/net/util.rs
index 2fc4a940881..46a3e07009f 100644
--- a/src/components/net/util.rs
+++ b/src/components/net/util.rs
@@ -3,11 +3,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use std::comm::{Chan, Port};
-use std::task;
+use servo_util::task::spawn_named;
 
-pub fn spawn_listener<A: Send>(f: proc(Port<A>)) -> SharedChan<A> {
+pub fn spawn_listener<A: Send, S: IntoSendStr>(name: S, f: proc(Port<A>)) -> SharedChan<A> {
     let (setup_port, setup_chan) = Chan::new();
-    do task::spawn {
+    do spawn_named(name) {
         let (port, chan) = SharedChan::new();
         setup_chan.send(chan);
         f(port);