Update crossbeam-channel to 0.3

components/compositing/Cargo.toml

@@ -15,6 +15,7 @@ path = "lib.rs"
 default = []
 
 [dependencies]
+crossbeam-channel = "0.3"
 embedder_traits = {path = "../embedder_traits"}
 euclid = "0.19"
 gfx_traits = {path = "../gfx_traits"}
@@ -28,7 +29,6 @@ msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 profile_traits = {path = "../profile_traits"}
 script_traits = {path = "../script_traits"}
-servo_channel = {path = "../channel"}
 servo_config = {path = "../config"}
 servo_geometry = {path = "../geometry"}
 servo_url = {path = "../url"}

components/compositing/compositor.rs

@@ -12,6 +12,7 @@ use crate::windowing::{
 };
 use crate::CompositionPipeline;
 use crate::SendableFrameTree;
+use crossbeam_channel::Sender;
 use euclid::{TypedPoint2D, TypedScale, TypedVector2D};
 use gfx_traits::Epoch;
 #[cfg(feature = "gleam")]
@@ -27,7 +28,6 @@ use script_traits::CompositorEvent::{MouseButtonEvent, MouseMoveEvent, TouchEven
 use script_traits::{AnimationState, AnimationTickType, ConstellationMsg, LayoutControlMsg};
 use script_traits::{MouseButton, MouseEventType, ScrollState, TouchEventType, TouchId};
 use script_traits::{UntrustedNodeAddress, WindowSizeData, WindowSizeType};
-use servo_channel::Sender;
 use servo_config::opts;
 use servo_geometry::DeviceIndependentPixel;
 use std::collections::HashMap;

components/compositing/compositor_thread.rs

@@ -6,6 +6,7 @@
 
 use crate::compositor::CompositingReason;
 use crate::SendableFrameTree;
+use crossbeam_channel::{Receiver, Sender};
 use embedder_traits::EventLoopWaker;
 use gfx_traits::Epoch;
 use ipc_channel::ipc::IpcSender;
@@ -14,7 +15,6 @@ use net_traits::image::base::Image;
 use profile_traits::mem;
 use profile_traits::time;
 use script_traits::{AnimationState, ConstellationMsg, EventResult};
-use servo_channel::{Receiver, Sender};
 use std::fmt::{Debug, Error, Formatter};
 use style_traits::viewport::ViewportConstraints;
 use webrender_api::{self, DeviceIntPoint, DeviceUintSize};
@@ -50,7 +50,7 @@ pub struct CompositorReceiver {
 
 impl CompositorReceiver {
     pub fn try_recv_compositor_msg(&mut self) -> Option<Msg> {
-        self.receiver.try_recv()
+        self.receiver.try_recv().ok()
     }
     pub fn recv_compositor_msg(&mut self) -> Msg {
         self.receiver.recv().unwrap()

components/constellation/Cargo.toml

@@ -17,6 +17,7 @@ canvas = {path = "../canvas"}
 clipboard = "0.5"
 canvas_traits = {path = "../canvas_traits"}
 compositing = {path = "../compositing"}
+crossbeam-channel = "0.3"
 debugger = {path = "../debugger"}
 devtools_traits = {path = "../devtools_traits"}
 euclid = "0.19"
@@ -35,7 +36,6 @@ net_traits = {path = "../net_traits"}
 profile_traits = {path = "../profile_traits"}
 script_traits = {path = "../script_traits"}
 serde = "1.0"
-servo_channel = {path = "../channel"}
 style_traits = {path = "../style_traits"}
 servo_config = {path = "../config"}
 servo_rand = {path = "../rand"}

components/constellation/constellation.rs

@@ -110,6 +110,7 @@ use crate::session_history::{
     JointSessionHistory, NeedsToReload, SessionHistoryChange, SessionHistoryDiff,
 };
 use crate::timer_scheduler::TimerScheduler;
+use crossbeam_channel::{unbounded, Receiver, Sender};
 use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg};
 use embedder_traits::{EmbedderMsg, EmbedderProxy};
 use euclid::{Size2D, TypedScale, TypedSize2D};
@@ -146,7 +147,6 @@ use script_traits::{LayoutMsg as FromLayoutMsg, ScriptMsg as FromScriptMsg, Scri
 use script_traits::{SWManagerMsg, ScopeThings, UpdatePipelineIdReason, WebDriverCommandMsg};
 use script_traits::{WindowSizeData, WindowSizeType};
 use serde::{Deserialize, Serialize};
-use servo_channel::{channel, Receiver, Sender};
 use servo_config::opts;
 use servo_config::prefs::PREFS;
 use servo_rand::{random, Rng, SeedableRng, ServoRng};
@@ -555,7 +555,7 @@ fn route_ipc_receiver_to_new_mpsc_receiver_preserving_errors<T>(
 where
     T: for<'de> Deserialize<'de> + Serialize + Send + 'static,
 {
-    let (mpsc_sender, mpsc_receiver) = channel();
+    let (mpsc_sender, mpsc_receiver) = unbounded();
     ROUTER.add_route(
         ipc_receiver.to_opaque(),
         Box::new(move |message| drop(mpsc_sender.send(message.to::<T>()))),
@@ -572,7 +572,7 @@ where
     pub fn start(
         state: InitialConstellationState,
     ) -> (Sender<FromCompositorMsg>, IpcSender<SWManagerMsg>) {
-        let (compositor_sender, compositor_receiver) = channel();
+        let (compositor_sender, compositor_receiver) = unbounded();
 
         // service worker manager to communicate with constellation
         let (swmanager_sender, swmanager_receiver) = ipc::channel().expect("ipc channel failure");
@@ -591,7 +591,7 @@ where
                 let layout_receiver =
                     route_ipc_receiver_to_new_mpsc_receiver_preserving_errors(ipc_layout_receiver);
 
-                let (network_listener_sender, network_listener_receiver) = channel();
+                let (network_listener_sender, network_listener_receiver) = unbounded();
 
                 let swmanager_receiver =
                     route_ipc_receiver_to_new_mpsc_receiver_preserving_errors(swmanager_receiver);
@@ -906,21 +906,21 @@ where
         // being called. If this happens, there's not much we can do
         // other than panic.
         let request = select! {
-            recv(self.script_receiver.select(), msg) => {
+            recv(self.script_receiver) -> msg => {
                 msg.expect("Unexpected script channel panic in constellation").map(Request::Script)
             }
-            recv(self.compositor_receiver.select(), msg) => {
+            recv(self.compositor_receiver) -> msg => {
                 Ok(Request::Compositor(msg.expect("Unexpected compositor channel panic in constellation")))
             }
-            recv(self.layout_receiver.select(), msg) => {
+            recv(self.layout_receiver) -> msg => {
                 msg.expect("Unexpected layout channel panic in constellation").map(Request::Layout)
             }
-            recv(self.network_listener_receiver.select(), msg) => {
+            recv(self.network_listener_receiver) -> msg => {
                 Ok(Request::NetworkListener(
                     msg.expect("Unexpected network listener channel panic in constellation")
                 ))
             }
-            recv(self.swmanager_receiver.select(), msg) => {
+            recv(self.swmanager_receiver) -> msg => {
                 msg.expect("Unexpected panic channel panic in constellation").map(Request::FromSWManager)
             }
         };

components/constellation/lib.rs

@@ -5,10 +5,12 @@
 #![deny(unsafe_code)]
 #![cfg_attr(feature = "unstable", feature(conservative_impl_trait))]
 
+#[macro_use]
+extern crate crossbeam_channel;
 #[macro_use]
 extern crate log;
 #[macro_use]
-extern crate servo_channel;
+extern crate serde;
 
 mod browsingcontext;
 mod constellation;

components/constellation/network_listener.rs

@@ -6,6 +6,7 @@
 //! Any redirects that are encountered are followed. Whenever a non-redirect
 //! response is received, it is forwarded to the appropriate script thread.
 
+use crossbeam_channel::Sender;
 use http::header::LOCATION;
 use ipc_channel::ipc;
 use ipc_channel::router::ROUTER;
@@ -15,7 +16,6 @@ use net_traits::request::{Destination, RequestInit};
 use net_traits::response::ResponseInit;
 use net_traits::{CoreResourceMsg, FetchChannels, FetchMetadata, FetchResponseMsg};
 use net_traits::{IpcSend, NetworkError, ResourceThreads};
-use servo_channel::Sender;
 
 pub struct NetworkListener {
     res_init: Option<ResponseInit>,