aboutsummaryrefslogtreecommitdiffstats
path: root/components/devtools/lib.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-01-21 03:48:49 -0700
committerbors-servo <metajack+bors@gmail.com>2015-01-21 03:48:49 -0700
commit8df0ee2bb5d40e4b22db1666982e2e5ea36513f6 (patch)
tree6bed465dae6bda2340db62dec1c40f0fd1d77513 /components/devtools/lib.rs
parent94ebc7c32d5ce58ada3f9d8ffdb60cc025eb5997 (diff)
parent808315926cf5fd49c26fcbbc4e2a2d281b3fca46 (diff)
downloadservo-8df0ee2bb5d40e4b22db1666982e2e5ea36513f6.tar.gz
servo-8df0ee2bb5d40e4b22db1666982e2e5ea36513f6.zip
auto merge of #4703 : servo/servo/task, r=saneyuki
IntoString has been removed from Rust, and named() will take a String, so there is no good reason to do otherwise here.
Diffstat (limited to 'components/devtools/lib.rs')
-rw-r--r--components/devtools/lib.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs
index 7e09a53c65e..fd4b57aa0d6 100644
--- a/components/devtools/lib.rs
+++ b/components/devtools/lib.rs
@@ -36,6 +36,7 @@ use devtools_traits::{ServerExitMsg, DevtoolsControlMsg, NewGlobal, DevtoolScrip
use servo_msg::constellation_msg::PipelineId;
use servo_util::task::spawn_named;
+use std::borrow::ToOwned;
use std::cell::RefCell;
use std::collections::HashMap;
use std::comm;
@@ -57,7 +58,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".to_owned(), proc() {
run_server(receiver, port)
});
sender
@@ -184,7 +185,7 @@ fn run_server(receiver: Receiver<DevtoolsControlMsg>, port: u16) {
Ok(stream) => {
let actors = actors.clone();
accepted_connections.push(stream.clone());
- spawn_named("DevtoolsClientHandler", proc() {
+ spawn_named("DevtoolsClientHandler".to_owned(), proc() {
// connection succeeded
handle_client(actors, stream.clone())
})