diff options
author | Bastien Orivel <eijebong@bananium.fr> | 2018-11-07 19:48:07 +0100 |
---|---|---|
committer | Bastien Orivel <eijebong@bananium.fr> | 2018-11-18 19:33:19 +0100 |
commit | 9a7eeb349a8aa657e063665ac92387ab8ef3ce28 (patch) | |
tree | 63c5aa1ba7cd7fdb1bf14bcc9cbb6e6c0e24431b /components/devtools/lib.rs | |
parent | 76195e0779469f29a5e27cd882e2bbe8b2c9d6dd (diff) | |
download | servo-9a7eeb349a8aa657e063665ac92387ab8ef3ce28.tar.gz servo-9a7eeb349a8aa657e063665ac92387ab8ef3ce28.zip |
Update crossbeam-channel to 0.3
Diffstat (limited to 'components/devtools/lib.rs')
-rw-r--r-- | components/devtools/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index 0768a79ed09..ddf89cd4436 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -33,12 +33,12 @@ use crate::actors::thread::ThreadActor; use crate::actors::timeline::TimelineActor; use crate::actors::worker::WorkerActor; use crate::protocol::JsonPacketStream; +use crossbeam_channel::{unbounded, Receiver, Sender}; use devtools_traits::{ChromeToDevtoolsControlMsg, ConsoleMessage, DevtoolsControlMsg}; use devtools_traits::{DevtoolScriptControlMsg, DevtoolsPageInfo, LogLevel, NetworkEvent}; use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId}; use ipc_channel::ipc::IpcSender; use msg::constellation_msg::PipelineId; -use servo_channel::{channel, Receiver, Sender}; use std::borrow::ToOwned; use std::cell::RefCell; use std::collections::hash_map::Entry::{Occupied, Vacant}; @@ -125,7 +125,7 @@ struct ResponseStartUpdateMsg { /// Spin up a devtools server that listens for connections on the specified port. pub fn start_server(port: u16) -> Sender<DevtoolsControlMsg> { - let (sender, receiver) = channel(); + let (sender, receiver) = unbounded(); { let sender = sender.clone(); thread::Builder::new() @@ -549,7 +549,7 @@ fn run_server( }) .expect("Thread spawning failed"); - while let Some(msg) = receiver.recv() { + while let Ok(msg) = receiver.recv() { match msg { DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::AddClient(stream)) => { let actors = actors.clone(); |