From 6ff3a5a3c1ac4a67ec2f1383a19a479eea2de503 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Fri, 13 Feb 2015 13:35:31 +0100 Subject: [PATCH] Do not glob-export DevtoolScriptControlMsg variants. --- components/devtools/actors/console.rs | 5 +++-- components/devtools/actors/inspector.rs | 5 +++-- components/devtools/actors/tab.rs | 8 +++++--- components/devtools_traits/lib.rs | 1 - components/script/script_task.rs | 19 +++++++++---------- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/components/devtools/actors/console.rs b/components/devtools/actors/console.rs index 60636059ced..6b1123ea38a 100644 --- a/components/devtools/actors/console.rs +++ b/components/devtools/actors/console.rs @@ -9,7 +9,7 @@ use actor::{Actor, ActorRegistry}; use protocol::JsonPacketStream; -use devtools_traits::{EvaluateJS, NullValue, VoidValue, NumberValue, StringValue, BooleanValue}; +use devtools_traits::{NullValue, VoidValue, NumberValue, StringValue, BooleanValue}; use devtools_traits::{ActorValue, DevtoolScriptControlMsg}; use msg::constellation_msg::PipelineId; @@ -221,7 +221,8 @@ impl Actor for ConsoleActor { "evaluateJS" => { let input = msg.get(&"text".to_string()).unwrap().as_string().unwrap().to_string(); let (chan, port) = channel(); - self.script_chan.send(EvaluateJS(self.pipeline, input.clone(), chan)).unwrap(); + self.script_chan.send(DevtoolScriptControlMsg::EvaluateJS( + self.pipeline, input.clone(), chan)).unwrap(); //TODO: extract conversion into protocol module or some other useful place let result = match try!(port.recv().map_err(|_| ())) { diff --git a/components/devtools/actors/inspector.rs b/components/devtools/actors/inspector.rs index 33871b1929f..43c8881a0f0 100644 --- a/components/devtools/actors/inspector.rs +++ b/components/devtools/actors/inspector.rs @@ -4,8 +4,9 @@ /// Liberally derived from the [Firefox JS implementation](http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/inspector.js). -use devtools_traits::{GetRootNode, GetDocumentElement, GetChildren, DevtoolScriptControlMsg}; -use devtools_traits::{GetLayout, NodeInfo, ModifyAttribute}; +use devtools_traits::{DevtoolScriptControlMsg, NodeInfo}; +use devtools_traits::DevtoolScriptControlMsg::{GetRootNode, GetDocumentElement, GetChildren}; +use devtools_traits::DevtoolScriptControlMsg::{GetLayout, ModifyAttribute}; use actor::{Actor, ActorRegistry}; use protocol::JsonPacketStream; diff --git a/components/devtools/actors/tab.rs b/components/devtools/actors/tab.rs index f0057243b73..1265361915f 100644 --- a/components/devtools/actors/tab.rs +++ b/components/devtools/actors/tab.rs @@ -8,7 +8,7 @@ use actor::{Actor, ActorRegistry}; use actors::console::ConsoleActor; -use devtools_traits::WantsLiveNotifications; +use devtools_traits::DevtoolScriptControlMsg; use protocol::JsonPacketStream; use serialize::json; @@ -100,7 +100,8 @@ impl Actor for TabActor { let console_actor = registry.find::(self.console.as_slice()); console_actor.streams.borrow_mut().push(stream.clone()); stream.write_json_packet(&msg); - console_actor.script_chan.send(WantsLiveNotifications(console_actor.pipeline, true)).unwrap(); + console_actor.script_chan.send( + DevtoolScriptControlMsg::WantsLiveNotifications(console_actor.pipeline, true)).unwrap(); true } @@ -114,7 +115,8 @@ impl Actor for TabActor { let console_actor = registry.find::(self.console.as_slice()); console_actor.streams.borrow_mut().pop(); stream.write_json_packet(&msg); - console_actor.script_chan.send(WantsLiveNotifications(console_actor.pipeline, false)).unwrap(); + console_actor.script_chan.send( + DevtoolScriptControlMsg::WantsLiveNotifications(console_actor.pipeline, false)).unwrap(); true } diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index b066d786454..2197391f5fa 100644 --- a/components/devtools_traits/lib.rs +++ b/components/devtools_traits/lib.rs @@ -20,7 +20,6 @@ extern crate "serialize" as rustc_serialize; extern crate url; extern crate util; -pub use self::DevtoolScriptControlMsg::*; pub use self::EvaluateJSReply::*; use rustc_serialize::{Decodable, Decoder}; diff --git a/components/script/script_task.rs b/components/script/script_task.rs index b28fcc95bff..8573efa9d3f 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -41,9 +41,8 @@ use page::{Page, IterablePage, Frame}; use timers::TimerId; use devtools; -use devtools_traits::{DevtoolsControlChan, DevtoolsControlPort, GetRootNode, DevtoolsPageInfo}; -use devtools_traits::{DevtoolsControlMsg, DevtoolScriptControlMsg, EvaluateJS, GetDocumentElement}; -use devtools_traits::{GetChildren, GetLayout, ModifyAttribute, WantsLiveNotifications}; +use devtools_traits::{DevtoolsControlChan, DevtoolsControlPort, DevtoolsPageInfo}; +use devtools_traits::{DevtoolsControlMsg, DevtoolScriptControlMsg}; use script_traits::CompositorEvent; use script_traits::CompositorEvent::{ResizeEvent, ReflowEvent, ClickEvent}; use script_traits::CompositorEvent::{MouseDownEvent, MouseUpEvent}; @@ -633,19 +632,19 @@ impl ScriptTask { fn handle_msg_from_devtools(&self, msg: DevtoolScriptControlMsg) { match msg { - EvaluateJS(id, s, reply) => + DevtoolScriptControlMsg::EvaluateJS(id, s, reply) => devtools::handle_evaluate_js(&*self.page.borrow(), id, s, reply), - GetRootNode(id, reply) => + DevtoolScriptControlMsg::GetRootNode(id, reply) => devtools::handle_get_root_node(&*self.page.borrow(), id, reply), - GetDocumentElement(id, reply) => + DevtoolScriptControlMsg::GetDocumentElement(id, reply) => devtools::handle_get_document_element(&*self.page.borrow(), id, reply), - GetChildren(id, node_id, reply) => + DevtoolScriptControlMsg::GetChildren(id, node_id, reply) => devtools::handle_get_children(&*self.page.borrow(), id, node_id, reply), - GetLayout(id, node_id, reply) => + DevtoolScriptControlMsg::GetLayout(id, node_id, reply) => devtools::handle_get_layout(&*self.page.borrow(), id, node_id, reply), - ModifyAttribute(id, node_id, modifications) => + DevtoolScriptControlMsg::ModifyAttribute(id, node_id, modifications) => devtools::handle_modify_attribute(&*self.page.borrow(), id, node_id, modifications), - WantsLiveNotifications(pipeline_id, to_send) => + DevtoolScriptControlMsg::WantsLiveNotifications(pipeline_id, to_send) => devtools::handle_wants_live_notifications(&*self.page.borrow(), pipeline_id, to_send), } }