diff options
| author | Keegan McAllister <mcallister.keegan@gmail.com> | 2014-09-20 15:35:08 -0700 |
|---|---|---|
| committer | Keegan McAllister <mcallister.keegan@gmail.com> | 2014-09-20 15:35:08 -0700 |
| commit | 045328c8e94f5bdfcd67105c5dfa9209f4cd501c (patch) | |
| tree | 1d5f8d958e12ae59e0ac720a7873e3c3b08cb1e8 /components/devtools/lib.rs | |
| parent | d6ba37c68c34a3748a789caeca225083275757e5 (diff) | |
| parent | a40b94d7f946d75e1a66af206efda9879b89c707 (diff) | |
| download | servo-045328c8e94f5bdfcd67105c5dfa9209f4cd501c.tar.gz servo-045328c8e94f5bdfcd67105c5dfa9209f4cd501c.zip | |
Merge pull request #3438 from servo/rustup
Upgrade Rust
Diffstat (limited to 'components/devtools/lib.rs')
| -rw-r--r-- | components/devtools/lib.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index 71fd82f5369..d7305ebdc90 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -22,10 +22,9 @@ extern crate collections; extern crate core; extern crate devtools_traits; extern crate debug; -extern crate std; extern crate serialize; extern crate sync; -extern crate servo_msg = "msg"; +extern crate "msg" as servo_msg; use actor::{Actor, ActorRegistry}; use actors::console::ConsoleActor; @@ -181,8 +180,8 @@ fn run_server(port: Receiver<DevtoolsControlMsg>) { //TODO: make constellation send ServerExitMsg on shutdown. // accept connections and process them, spawning a new tasks for each one - for stream in acceptor.incoming() { - match stream { + loop { + match acceptor.accept() { Err(ref e) if e.kind == TimedOut => { match port.try_recv() { Ok(ServerExitMsg) | Err(Disconnected) => break, |