diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2017-12-17 23:53:32 +0100 |
---|---|---|
committer | Gregory Terzian <gterzian@users.noreply.github.com> | 2018-09-12 13:33:32 +0800 |
commit | 2a996fbc8fef722b264389680cc55c25c46807d1 (patch) | |
tree | 22c19321899cf4b35384c8c8e186f1a0bf7913c8 /components/webdriver_server/lib.rs | |
parent | b977b4994c678ce1d9bca69be72d095522c25f71 (diff) | |
download | servo-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/webdriver_server/lib.rs')
-rw-r--r-- | components/webdriver_server/lib.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 4caf137d32f..b4c61a1ddce 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -19,6 +19,7 @@ extern crate net_traits; extern crate regex; extern crate rustc_serialize; extern crate script_traits; +extern crate servo_channel; extern crate servo_config; extern crate servo_url; extern crate uuid; @@ -38,12 +39,12 @@ use rustc_serialize::json::{Json, ToJson}; use script_traits::{ConstellationMsg, LoadData, WebDriverCommandMsg}; use script_traits::webdriver_msg::{LoadStatus, WebDriverCookieError, WebDriverFrameId}; use script_traits::webdriver_msg::{WebDriverJSError, WebDriverJSResult, WebDriverScriptCommand}; +use servo_channel::Sender; use servo_config::prefs::{PREFS, PrefValue}; use servo_url::ServoUrl; use std::borrow::ToOwned; use std::collections::BTreeMap; use std::net::{SocketAddr, SocketAddrV4}; -use std::sync::mpsc::Sender; use std::thread; use std::time::Duration; use uuid::Uuid; @@ -1180,7 +1181,7 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler { fn delete_session(&mut self, _session: &Option<Session>) { // Servo doesn't support multiple sessions, so we exit on session deletion - let _ = self.constellation_chan.send(ConstellationMsg::Exit); + let _ = self.constellation_chan.send(ConstellationMsg::Exit).unwrap(); self.session = None; } } |