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/net/http_cache.rs | |
parent | 76195e0779469f29a5e27cd882e2bbe8b2c9d6dd (diff) | |
download | servo-9a7eeb349a8aa657e063665ac92387ab8ef3ce28.tar.gz servo-9a7eeb349a8aa657e063665ac92387ab8ef3ce28.zip |
Update crossbeam-channel to 0.3
Diffstat (limited to 'components/net/http_cache.rs')
-rw-r--r-- | components/net/http_cache.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/net/http_cache.rs b/components/net/http_cache.rs index d467a38baf3..30694f2c8e0 100644 --- a/components/net/http_cache.rs +++ b/components/net/http_cache.rs @@ -8,6 +8,7 @@ //! and <http://tools.ietf.org/html/rfc7232>. use crate::fetch::methods::{Data, DoneChannel}; +use crossbeam_channel::{unbounded, Sender}; use headers_core::HeaderMapExt; use headers_ext::{CacheControl, ContentRange, Expires, LastModified, Pragma, Range, Vary}; use http::header::HeaderValue; @@ -21,7 +22,6 @@ use net_traits::request::Request; use net_traits::response::{HttpsState, Response, ResponseBody}; use net_traits::{FetchMetadata, Metadata}; use servo_arc::Arc; -use servo_channel::{channel, Sender}; use servo_config::prefs::PREFS; use servo_url::ServoUrl; use std::collections::HashMap; @@ -306,7 +306,7 @@ fn create_cached_response( response.headers = cached_headers.clone(); response.body = cached_resource.body.clone(); if let ResponseBody::Receiving(_) = *cached_resource.body.lock().unwrap() { - let (done_sender, done_receiver) = channel(); + let (done_sender, done_receiver) = unbounded(); *done_chan = Some((done_sender.clone(), done_receiver)); cached_resource .awaiting_body @@ -670,7 +670,7 @@ impl HttpCache { // Otherwise, create a new dedicated channel to update the consumer. // The response constructed here will replace the 304 one from the network. let in_progress_channel = match *cached_resource.body.lock().unwrap() { - ResponseBody::Receiving(..) => Some(channel()), + ResponseBody::Receiving(..) => Some(unbounded()), ResponseBody::Empty | ResponseBody::Done(..) => None, }; match in_progress_channel { |