Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Do not glob-export DevtoolsControlMsg variants.

Browse source
This commit is contained in:
Ruud van Asseldonk 2015-02-13 13:15:14 +01:00
parent 66f4faf44f
commit 1452614e28
5 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/devtools/lib.rs
View file

@ -35,8 +35,8 @@ use actors::root::RootActor;
use actors::tab::TabActor;
use protocol::JsonPacketStream;
use devtools_traits::{ServerExitMsg, DevtoolsControlMsg, NewGlobal, DevtoolScriptControlMsg};
use devtools_traits::{DevtoolsPageInfo, SendConsoleMessage, ConsoleMessage};
use devtools_traits::{ConsoleMessage, DevtoolsControlMsg};
use devtools_traits::{DevtoolsPageInfo, DevtoolScriptControlMsg};
use msg::constellation_msg::PipelineId;
use util::task::spawn_named;
@ -231,11 +231,11 @@ fn run_server(receiver: Receiver<DevtoolsControlMsg>, port: u16) {
match acceptor.accept() {
Err(ref e) if e.kind == TimedOut => {
match receiver.try_recv() {
Ok(ServerExitMsg) | Err(Disconnected) => break,
Ok(NewGlobal(id, sender, pageinfo)) =>
Ok(DevtoolsControlMsg::ServerExitMsg) | Err(Disconnected) => break,
Ok(DevtoolsControlMsg::NewGlobal(id, sender, pageinfo)) =>
handle_new_global(actors.clone(), id,sender, &mut actor_pipelines,
pageinfo),
Ok(SendConsoleMessage(id, console_message)) =>
Ok(DevtoolsControlMsg::SendConsoleMessage(id, console_message)) =>
handle_console_message(actors.clone(), id, console_message,
&actor_pipelines),
Err(Empty) => acceptor.set_timeout(Some(POLL_TIMEOUT)),