From 14b1c320a68153b186dba05f850623fd577f8214 Mon Sep 17 00:00:00 2001
From: Clark Gaebel <cgaebel@mozilla.com>
Date: Tue, 28 Oct 2014 10:06:39 -0700
Subject: [PATCH] make naming more consistent

---
 components/devtools/lib.rs                          | 4 ++--
 components/gfx/font_cache_task.rs                   | 2 +-
 components/net/image_cache_task.rs                  | 8 ++++----
 components/script/dom/dedicatedworkerglobalscope.rs | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs
index dc37e5f8d0fc..6c756237c30f 100644
--- a/components/devtools/lib.rs
+++ b/components/devtools/lib.rs
@@ -62,7 +62,7 @@ mod protocol;
 /// Spin up a devtools server that listens for connections on the specified port.
 pub fn start_server(port: u16) -> Sender<DevtoolsControlMsg> {
     let (sender, receiver) = comm::channel();
-    spawn_named("devtools", proc() {
+    spawn_named("Devtools", proc() {
         run_server(receiver, port)
     });
     sender
@@ -194,7 +194,7 @@ fn run_server(receiver: Receiver<DevtoolsControlMsg>, port: u16) {
             Err(_e) => { /* connection failed */ }
             Ok(stream) => {
                 let actors = actors.clone();
-                spawn_named("devtools-client-handler", proc() {
+                spawn_named("DevtoolsClientHandler", proc() {
                     // connection succeeded
                     handle_client(actors, stream.clone())
                 })
diff --git a/components/gfx/font_cache_task.rs b/components/gfx/font_cache_task.rs
index ff557adf816d..6c524289d650 100644
--- a/components/gfx/font_cache_task.rs
+++ b/components/gfx/font_cache_task.rs
@@ -246,7 +246,7 @@ impl FontCacheTask {
     pub fn new(resource_task: ResourceTask) -> FontCacheTask {
         let (chan, port) = channel();
 
-        spawn_named("font-cache-task", proc() {
+        spawn_named("FontCacheTask", proc() {
             // TODO: Allow users to specify these.
             let mut generic_fonts = HashMap::with_capacity(5);
             add_generic_font(&mut generic_fonts, "serif", "Times New Roman");
diff --git a/components/net/image_cache_task.rs b/components/net/image_cache_task.rs
index e3e9bd952a66..6474d8bee721 100644
--- a/components/net/image_cache_task.rs
+++ b/components/net/image_cache_task.rs
@@ -84,7 +84,7 @@ impl ImageCacheTask {
         let (chan, port) = channel();
         let chan_clone = chan.clone();
 
-        spawn_named("image-cache-task", proc() {
+        spawn_named("ImageCacheTask", proc() {
             let mut cache = ImageCache {
                 resource_task: resource_task,
                 port: port,
@@ -105,7 +105,7 @@ impl ImageCacheTask {
     pub fn new_sync(resource_task: ResourceTask, task_pool: TaskPool) -> ImageCacheTask {
         let (chan, port) = channel();
 
-        spawn_named("image-cache-task-sync", proc() {
+        spawn_named("ImageCacheTask (sync)", proc() {
             let inner_cache = ImageCacheTask::new(resource_task, task_pool);
 
             loop {
@@ -248,7 +248,7 @@ impl ImageCache {
                 let resource_task = self.resource_task.clone();
                 let url_clone = url.clone();
 
-                spawn_named("image-cache-task-prefetch", proc() {
+                spawn_named("ImageCacheTask (prefetch)", proc() {
                     let url = url_clone;
                     debug!("image_cache_task: started fetch for {:s}", url.serialize());
 
@@ -463,7 +463,7 @@ fn load_image_data(url: Url, resource_task: ResourceTask) -> Result<Vec<u8>, ()>
 pub fn spawn_listener<A: Send>(f: proc(Receiver<A>):Send) -> Sender<A> {
     let (setup_chan, setup_port) = channel();
 
-    spawn_named("image-cache-task-listener", proc() {
+    spawn_named("ImageCacheTask (listener)", proc() {
         let (chan, port) = channel();
         setup_chan.send(chan);
         f(port);
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs
index 33d2f956071e..6dafca0f8855 100644
--- a/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/components/script/dom/dedicatedworkerglobalscope.rs
@@ -87,7 +87,7 @@ impl DedicatedWorkerGlobalScope {
                             parent_sender: ScriptChan,
                             own_sender: ScriptChan,
                             receiver: Receiver<ScriptMsg>) {
-        spawn_named_native(format!("Web worker for {}", worker_url.serialize()), proc() {
+        spawn_named_native(format!("WebWorker for {}", worker_url.serialize()), proc() {
 
             task_state::initialize(Script | InWorker);