aboutsummaryrefslogtreecommitdiffstats
path: root/components/debugger/lib.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2017-12-17 23:53:32 +0100
committerGregory Terzian <gterzian@users.noreply.github.com>2018-09-12 13:33:32 +0800
commit2a996fbc8fef722b264389680cc55c25c46807d1 (patch)
tree22c19321899cf4b35384c8c8e186f1a0bf7913c8 /components/debugger/lib.rs
parentb977b4994c678ce1d9bca69be72d095522c25f71 (diff)
downloadservo-2a996fbc8fef722b264389680cc55c25c46807d1.tar.gz
servo-2a996fbc8fef722b264389680cc55c25c46807d1.zip
Replace mpsc with crossbeam/servo channel, update ipc-channel
Co-authored-by: Gregory Terzian <gterzian@users.noreply.github.com>
Diffstat (limited to 'components/debugger/lib.rs')
-rw-r--r--components/debugger/lib.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/components/debugger/lib.rs b/components/debugger/lib.rs
index 6190ebec89b..938e16906e3 100644
--- a/components/debugger/lib.rs
+++ b/components/debugger/lib.rs
@@ -4,10 +4,9 @@
#[macro_use]
extern crate log;
+extern crate servo_channel;
extern crate ws;
-use std::sync::mpsc;
-use std::sync::mpsc::channel;
use std::thread;
use ws::{Builder, CloseCode, Handler, Handshake};
@@ -15,7 +14,7 @@ enum Message {
ShutdownServer,
}
-pub struct Sender(mpsc::Sender<Message>);
+pub struct Sender(servo_channel::Sender<Message>);
struct Connection {
sender: ws::Sender,
@@ -38,7 +37,7 @@ impl Handler for Connection {
pub fn start_server(port: u16) -> Sender {
debug!("Starting server.");
- let (sender, receiver) = channel();
+ let (sender, receiver) = servo_channel::channel();
thread::Builder::new()
.name("debugger".to_owned())
.spawn(move || {
@@ -51,7 +50,7 @@ pub fn start_server(port: u16) -> Sender {
.spawn(move || {
socket.listen(("127.0.0.1", port)).unwrap();
}).expect("Thread spawning failed");
- while let Ok(message) = receiver.recv() {
+ while let Some(message) = receiver.recv() {
match message {
Message::ShutdownServer => {
break;