mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Replace mpsc with crossbeam/servo channel, update ipc-channel
Co-authored-by: Gregory Terzian <gterzian@users.noreply.github.com>
This commit is contained in:
parent
b977b4994c
commit
2a996fbc8f
89 changed files with 341 additions and 377 deletions
|
@ -30,13 +30,13 @@ use net_traits::{CookieSource, NetworkError};
|
|||
use net_traits::request::{Request, RequestInit, RequestMode, CredentialsMode, Destination};
|
||||
use net_traits::response::ResponseBody;
|
||||
use new_fetch_context;
|
||||
use servo_channel::{channel, Receiver};
|
||||
use servo_url::{ServoUrl, ImmutableOrigin};
|
||||
use std::collections::HashMap;
|
||||
use std::io::{Read, Write};
|
||||
use std::str::FromStr;
|
||||
use std::sync::{Arc, Mutex, RwLock, mpsc};
|
||||
use std::sync::{Arc, Mutex, RwLock};
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::mpsc::Receiver;
|
||||
|
||||
fn mock_origin() -> ImmutableOrigin {
|
||||
ServoUrl::parse("http://servo.org").unwrap().origin()
|
||||
|
@ -213,7 +213,7 @@ fn test_request_and_response_data_with_network_messages() {
|
|||
pipeline_id: Some(TEST_PIPELINE_ID),
|
||||
.. RequestInit::default()
|
||||
});
|
||||
let (devtools_chan, devtools_port) = mpsc::channel();
|
||||
let (devtools_chan, devtools_port) = channel();
|
||||
let response = fetch(&mut request, Some(devtools_chan));
|
||||
assert!(response.internal_response.unwrap().status.unwrap().is_success());
|
||||
|
||||
|
@ -300,14 +300,14 @@ fn test_request_and_response_message_from_devtool_without_pipeline_id() {
|
|||
pipeline_id: None,
|
||||
.. RequestInit::default()
|
||||
});
|
||||
let (devtools_chan, devtools_port) = mpsc::channel();
|
||||
let (devtools_chan, devtools_port) = channel();
|
||||
let response = fetch(&mut request, Some(devtools_chan));
|
||||
assert!(response.internal_response.unwrap().status.unwrap().is_success());
|
||||
|
||||
let _ = server.close();
|
||||
|
||||
// notification received from devtools
|
||||
assert!(devtools_port.try_recv().is_err());
|
||||
assert!(devtools_port.try_recv().is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
@ -334,7 +334,7 @@ fn test_redirected_request_to_devtools() {
|
|||
pipeline_id: Some(TEST_PIPELINE_ID),
|
||||
.. RequestInit::default()
|
||||
});
|
||||
let (devtools_chan, devtools_port) = mpsc::channel();
|
||||
let (devtools_chan, devtools_port) = channel();
|
||||
fetch(&mut request, Some(devtools_chan));
|
||||
|
||||
let _ = pre_server.close();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue