diff options
author | Samson <16504129+sagudev@users.noreply.github.com> | 2023-09-11 21:16:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-11 19:16:54 +0000 |
commit | aad2dccc9c9f6b89922c07933cfa7087a8cd1ec4 (patch) | |
tree | 68dec1a9d53f4ed564843a9580fba70bf90dbef1 /components/net/fetch | |
parent | 413da4ca69d3013528c09bbaf38629a72384372d (diff) | |
download | servo-aad2dccc9c9f6b89922c07933cfa7087a8cd1ec4.tar.gz servo-aad2dccc9c9f6b89922c07933cfa7087a8cd1ec4.zip |
Strict import formatting (grouping and granularity) (#30325)
* strict imports formatting
* Reformat all imports
Diffstat (limited to 'components/net/fetch')
-rw-r--r-- | components/net/fetch/headers.rs | 5 | ||||
-rw-r--r-- | components/net/fetch/methods.rs | 53 |
2 files changed, 31 insertions, 27 deletions
diff --git a/components/net/fetch/headers.rs b/components/net/fetch/headers.rs index 54fbe636f6f..3a29f841d64 100644 --- a/components/net/fetch/headers.rs +++ b/components/net/fetch/headers.rs @@ -2,11 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -use headers::HeaderMap; -use net_traits::fetch::headers::get_value_from_header_list; use std::iter::Peekable; use std::str::Chars; +use headers::HeaderMap; +use net_traits::fetch::headers::get_value_from_header_list; + /// <https://fetch.spec.whatwg.org/#http-tab-or-space> const HTTP_TAB_OR_SPACE: &[char] = &['\u{0009}', '\u{0020}']; diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs index 1cac2297921..5c5f6942f54 100644 --- a/components/net/fetch/methods.rs +++ b/components/net/fetch/methods.rs @@ -2,21 +2,22 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -use crate::data_loader::decode; -use crate::fetch::cors_cache::CorsCache; -use crate::fetch::headers::determine_nosniff; -use crate::filemanager_thread::{FileManager, FILE_CHUNK_SIZE}; -use crate::http_loader::{determine_requests_referrer, http_fetch, HttpState}; -use crate::http_loader::{set_default_accept, set_default_accept_language}; -use crate::subresource_integrity::is_response_integrity_valid; -use base64::{engine::general_purpose, Engine as _}; +use std::borrow::Cow; +use std::fs::File; +use std::io::{self, BufReader, Seek, SeekFrom}; +use std::ops::Bound; +use std::sync::atomic::Ordering; +use std::sync::{Arc, Mutex}; +use std::{mem, str}; + +use base64::engine::general_purpose; +use base64::Engine as _; use content_security_policy as csp; use crossbeam_channel::Sender; use devtools_traits::DevtoolsControlMsg; use headers::{AccessControlExposeHeaders, ContentType, HeaderMapExt, Range}; use http::header::{self, HeaderMap, HeaderName}; -use http::Method; -use http::StatusCode; +use http::{Method, StatusCode}; use ipc_channel::ipc::{self, IpcReceiver}; use lazy_static::lazy_static; use log::{debug, warn}; @@ -24,31 +25,33 @@ use mime::{self, Mime}; use net_traits::blob_url_store::{parse_blob_url, BlobURLStoreError}; use net_traits::filemanager_thread::{FileTokenCheck, RelativePos}; use net_traits::request::{ - is_cors_safelisted_method, is_cors_safelisted_request_header, Origin, ResponseTainting, Window, -}; -use net_traits::request::{ - BodyChunkRequest, BodyChunkResponse, CredentialsMode, Destination, Referrer, Request, - RequestMode, + is_cors_safelisted_method, is_cors_safelisted_request_header, BodyChunkRequest, + BodyChunkResponse, CredentialsMode, Destination, Origin, Referrer, Request, RequestMode, + ResponseTainting, Window, }; use net_traits::response::{Response, ResponseBody, ResponseType}; -use net_traits::{FetchTaskTarget, NetworkError, ReferrerPolicy, ResourceFetchTiming}; -use net_traits::{ResourceAttribute, ResourceTimeValue, ResourceTimingType}; +use net_traits::{ + FetchTaskTarget, NetworkError, ReferrerPolicy, ResourceAttribute, ResourceFetchTiming, + ResourceTimeValue, ResourceTimingType, +}; use rustls::Certificate; use serde::{Deserialize, Serialize}; use servo_arc::Arc as ServoArc; use servo_url::ServoUrl; -use std::borrow::Cow; -use std::fs::File; -use std::io::{self, BufReader, Seek, SeekFrom}; -use std::mem; -use std::ops::Bound; -use std::str; -use std::sync::atomic::Ordering; -use std::sync::{Arc, Mutex}; use tokio::sync::mpsc::{ unbounded_channel, UnboundedReceiver as TokioReceiver, UnboundedSender as TokioSender, }; +use crate::data_loader::decode; +use crate::fetch::cors_cache::CorsCache; +use crate::fetch::headers::determine_nosniff; +use crate::filemanager_thread::{FileManager, FILE_CHUNK_SIZE}; +use crate::http_loader::{ + determine_requests_referrer, http_fetch, set_default_accept, set_default_accept_language, + HttpState, +}; +use crate::subresource_integrity::is_response_integrity_valid; + lazy_static! { static ref X_CONTENT_TYPE_OPTIONS: HeaderName = HeaderName::from_static("x-content-type-options"); |