diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-18 14:39:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-18 14:39:57 -0500 |
commit | eb3af18581f457a51b397aed198ce107255c3bd3 (patch) | |
tree | 127408c5b75c935552b80c7307f8086f176878ed /components/servo/lib.rs | |
parent | ac17f08d1972685726ef73956d91f01608127d38 (diff) | |
parent | 9a7eeb349a8aa657e063665ac92387ab8ef3ce28 (diff) | |
download | servo-eb3af18581f457a51b397aed198ce107255c3bd3.tar.gz servo-eb3af18581f457a51b397aed198ce107255c3bd3.zip |
Auto merge of #22142 - Eijebong:crossbeamup, r=jdm
Update crossbeam-channel to 0.3
https://github.com/servo/ipc-channel/pull/210
<!-- 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/22142)
<!-- Reviewable:end -->
Diffstat (limited to 'components/servo/lib.rs')
-rw-r--r-- | components/servo/lib.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/servo/lib.rs b/components/servo/lib.rs index ce3ee0962b1..6639da00560 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -42,7 +42,6 @@ pub use profile_traits; pub use script; pub use script_layout_interface; pub use script_traits; -pub use servo_channel; pub use servo_config; pub use servo_geometry; pub use servo_url; @@ -71,6 +70,7 @@ use compositing::{IOCompositor, RenderNotifier, ShutdownState}; use constellation::content_process_sandbox_profile; use constellation::{Constellation, InitialConstellationState, UnprivilegedPipelineContent}; use constellation::{FromCompositorLogger, FromScriptLogger}; +use crossbeam_channel::{unbounded, Sender}; use embedder_traits::{EmbedderMsg, EmbedderProxy, EmbedderReceiver, EventLoopWaker}; use env_logger::Builder as EnvLoggerBuilder; #[cfg(all(not(target_os = "windows"), not(target_os = "ios")))] @@ -86,7 +86,6 @@ use profile::time as profile_time; use profile_traits::mem; use profile_traits::time; use script_traits::{ConstellationMsg, SWManagerSenders, ScriptToConstellationChan}; -use servo_channel::{channel, Sender}; use servo_config::opts; use servo_config::prefs::PREFS; use std::borrow::Cow; @@ -451,7 +450,7 @@ where fn create_embedder_channel( event_loop_waker: Box<dyn EventLoopWaker>, ) -> (EmbedderProxy, EmbedderReceiver) { - let (sender, receiver) = channel(); + let (sender, receiver) = unbounded(); ( EmbedderProxy { sender: sender, @@ -464,7 +463,7 @@ fn create_embedder_channel( fn create_compositor_channel( event_loop_waker: Box<dyn EventLoopWaker>, ) -> (CompositorProxy, CompositorReceiver) { - let (sender, receiver) = channel(); + let (sender, receiver) = unbounded(); ( CompositorProxy { sender: sender, |