diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-04-11 12:58:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-11 12:58:34 -0400 |
commit | 9ab0af01fe2618d81555f0c2bea3585c0f468628 (patch) | |
tree | 869e624bc018c9a7f97d40dccea6883f66d400da /components/script/fetch.rs | |
parent | dd2deeabca7eeb40e6a8fe0c1ee4550d64e0c235 (diff) | |
parent | 6b2be9b31de1503e90a62cc7d597dc4bd467d998 (diff) | |
download | servo-9ab0af01fe2618d81555f0c2bea3585c0f468628.tar.gz servo-9ab0af01fe2618d81555f0c2bea3585c0f468628.zip |
Auto merge of #22521 - lucasfantacuci:use_build_pattern_with_requestinit, r=jdm,KiChjang
Refactoring RequestInit to use a Builder Pattern
<!-- Please describe your changes on the following line: -->
If RequestInit::new accepts all of the mandatory arguments and then the builder pattern is used for customizable options, the resulting code might be easier to match against specification text like
---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #22427
- [x] These changes do not require tests because it is a code refactoring.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22521)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/fetch.rs')
-rw-r--r-- | components/script/fetch.rs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/components/script/fetch.rs b/components/script/fetch.rs index bed4d3c5d12..a95fbb7437d 100644 --- a/components/script/fetch.rs +++ b/components/script/fetch.rs @@ -24,7 +24,7 @@ use crate::task_source::TaskSourceName; use ipc_channel::ipc; use ipc_channel::router::ROUTER; use js::jsapi::JSAutoCompartment; -use net_traits::request::RequestInit as NetTraitsRequestInit; +use net_traits::request::RequestBuilder; use net_traits::request::{Request as NetTraitsRequest, ServiceWorkersMode}; use net_traits::CoreResourceMsg::Fetch as NetTraitsFetch; use net_traits::{FetchChannels, FetchResponseListener, NetworkError}; @@ -98,16 +98,18 @@ fn from_referrer_to_referrer_url(request: &NetTraitsRequest) -> Option<ServoUrl> request.referrer.to_url().map(|url| url.clone()) } -fn request_init_from_request(request: NetTraitsRequest) -> NetTraitsRequestInit { - NetTraitsRequestInit { +fn request_init_from_request(request: NetTraitsRequest) -> RequestBuilder { + RequestBuilder { method: request.method.clone(), url: request.url(), headers: request.headers.clone(), unsafe_request: request.unsafe_request, body: request.body.clone(), + service_workers_mode: ServiceWorkersMode::All, destination: request.destination, synchronous: request.synchronous, mode: request.mode.clone(), + cache_mode: request.cache_mode, use_cors_preflight: request.use_cors_preflight, credentials_mode: request.credentials_mode, use_url_credentials: request.use_url_credentials, @@ -120,8 +122,8 @@ fn request_init_from_request(request: NetTraitsRequest) -> NetTraitsRequestInit referrer_policy: request.referrer_policy, pipeline_id: request.pipeline_id, redirect_mode: request.redirect_mode, - cache_mode: request.cache_mode, - ..NetTraitsRequestInit::default() + integrity_metadata: "".to_owned(), + url_list: vec![], } } |