Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use more specific names for Hyper's Request/Response types in http_loader.

Browse source
This commit is contained in:
Ms2ger 2016-11-22 00:48:00 +01:00
parent 1321c0704d
commit 6219105eed
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/net/http_loader.rs
View file

@ -13,7 +13,7 @@ use flate2::read::{DeflateDecoder, GzDecoder};
use hsts::HstsList; use hsts::HstsList;
use hyper::Error as HttpError; use hyper::Error as HttpError;
use hyper::LanguageTag; use hyper::LanguageTag;
use hyper::client::{Pool, Request, Response}; use hyper::client::{Pool, Request as HyperRequest, Response as HyperResponse};
use hyper::header::{AcceptEncoding, AcceptLanguage, Basic, ContentEncoding, ContentLength}; use hyper::header::{AcceptEncoding, AcceptLanguage, Basic, ContentEncoding, ContentLength};
use hyper::header::{Encoding, Header, Headers, Quality, QualityItem, Referer}; use hyper::header::{Encoding, Header, Headers, Quality, QualityItem, Referer};
use hyper::header::{SetCookie, qitem}; use hyper::header::{SetCookie, qitem};
@ -79,7 +79,7 @@ fn precise_time_ms() -> u64 {
} }
pub struct WrappedHttpResponse { pub struct WrappedHttpResponse {
pub response: Response pub response: HyperResponse
} }
impl Read for WrappedHttpResponse { impl Read for WrappedHttpResponse {
@ -146,9 +146,9 @@ impl HttpRequestFactory for NetworkHttpRequestFactory {
fn create(&self, url: ServoUrl, method: Method, headers: Headers) fn create(&self, url: ServoUrl, method: Method, headers: Headers)
-> Result<WrappedHttpRequest, LoadError> { -> Result<WrappedHttpRequest, LoadError> {
let connection = Request::with_connector(method, let connection = HyperRequest::with_connector(method,
url.clone().into_url().unwrap(), url.clone().into_url().unwrap(),
&*self.connector); &*self.connector);
if let Err(HttpError::Ssl(ref error)) = connection { if let Err(HttpError::Ssl(ref error)) = connection {
let error: &(Error + Send + 'static) = &**error; let error: &(Error + Send + 'static) = &**error;
@ -191,7 +191,7 @@ pub trait HttpRequest {
} }
pub struct WrappedHttpRequest { pub struct WrappedHttpRequest {
request: Request<Fresh> request: HyperRequest<Fresh>
} }
impl HttpRequest for WrappedHttpRequest { impl HttpRequest for WrappedHttpRequest {