diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-03 15:04:43 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-03 15:04:43 -0500 |
commit | 738f0eb97428f6b24c26df7e64a8328e0575b05c (patch) | |
tree | 5d31e7153bebb340dda5b18d356b3164486008d4 /components/script/script_thread.rs | |
parent | 4984a83f675484a752e305f2d592f6d9e774c4fb (diff) | |
parent | 4fbe415e8023538779dc9825e0da8fdc26f46c8f (diff) | |
download | servo-738f0eb97428f6b24c26df7e64a8328e0575b05c.tar.gz servo-738f0eb97428f6b24c26df7e64a8328e0575b05c.zip |
Auto merge of #14044 - servo:bluetooth, r=emilio
Split the bluetooth code out from the net crates.
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14044)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r-- | components/script/script_thread.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 6a789527f78..c460472ac13 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -17,6 +17,7 @@ //! a page runs its course and the script thread returns to processing events in the main event //! loop. +use bluetooth_traits::BluetoothMethodMsg; use devtools; use devtools_traits::{DevtoolScriptControlMsg, DevtoolsPageInfo}; use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId}; @@ -73,7 +74,6 @@ use layout_wrapper::ServoLayoutNode; use mem::heap_size_of_self_and_children; use msg::constellation_msg::{FrameType, PipelineId, PipelineNamespace, ReferrerPolicy}; use net_traits::{CoreResourceMsg, IpcSend, Metadata, ResourceThreads}; -use net_traits::bluetooth_thread::BluetoothMethodMsg; use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheResult, ImageCacheThread}; use net_traits::request::{CredentialsMode, Destination, RequestInit}; use network_listener::NetworkListener; |