Auto merge of #7009 - connorimes:remove-confusing-typedefs, r=Ms2ger

Remove typedefs DevtoolsControlChan and DevtoolsControlPort



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7009)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-07 14:41:37 -06:00
commit a5c7508fab
4 changed files with 7 additions and 10 deletions

View file

@ -53,7 +53,7 @@ use timers::TimerId;
use devtools;
use webdriver_handlers;
use devtools_traits::{DevtoolsControlPort, DevtoolsPageInfo, DevtoolScriptControlMsg};
use devtools_traits::{DevtoolsPageInfo, DevtoolScriptControlMsg};
use devtools_traits::{ScriptToDevtoolsControlMsg, TimelineMarker, TimelineMarkerType};
use devtools_traits::{TracingMetadata};
use script_traits::CompositorEvent::{MouseDownEvent, MouseUpEvent};
@ -336,7 +336,7 @@ pub struct ScriptTask {
devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
/// For receiving commands from an optional devtools server. Will be ignored if
/// no such server exists.
devtools_port: DevtoolsControlPort,
devtools_port: Receiver<DevtoolScriptControlMsg>,
devtools_sender: IpcSender<DevtoolScriptControlMsg>,
/// For sending timeline markers. Will be ignored if
/// no devtools server