Skip to content

Commit

Permalink
make naming more consistent
Browse files Browse the repository at this point in the history
  • Loading branch information
Clark Gaebel committed Oct 28, 2014
1 parent 6df1cc8 commit 14b1c32
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions components/devtools/lib.rs
Expand Up @@ -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
Expand Down Expand Up @@ -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())
})
Expand Down
2 changes: 1 addition & 1 deletion components/gfx/font_cache_task.rs
Expand Up @@ -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");
Expand Down
8 changes: 4 additions & 4 deletions components/net/image_cache_task.rs
Expand Up @@ -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,
Expand All @@ -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 {
Expand Down Expand Up @@ -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());

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/dedicatedworkerglobalscope.rs
Expand Up @@ -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);

Expand Down

5 comments on commit 14b1c32

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pcwalton
at cgaebel@14b1c32

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging cgaebel/servo/use-custom-spawn = 14b1c32 into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cgaebel/servo/use-custom-spawn = 14b1c32 merged ok, testing candidate = ff06be9

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = ff06be9

Please sign in to comment.