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

Remove WrappedHttpRequest.

Browse source
This commit is contained in:
Ms2ger 2016-11-22 11:43:31 +01:00
parent 04d5f6e7fa
commit 7192a747f2
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/net/http_loader.rs
View file

@ -129,7 +129,7 @@ struct NetworkHttpRequestFactory {
impl NetworkHttpRequestFactory { impl NetworkHttpRequestFactory {
fn create(&self, url: ServoUrl, method: Method, headers: Headers) fn create(&self, url: ServoUrl, method: Method, headers: Headers)
-> Result<WrappedHttpRequest, LoadError> { -> Result<HyperRequest<Fresh>, LoadError> {
let connection = HyperRequest::with_connector(method, let connection = HyperRequest::with_connector(method,
url.clone().into_url().unwrap(), url.clone().into_url().unwrap(),
&*self.connector); &*self.connector);
@ -164,14 +164,10 @@ impl NetworkHttpRequestFactory {
}; };
*request.headers_mut() = headers; *request.headers_mut() = headers;
Ok(WrappedHttpRequest { request: request }) Ok(request)
} }
} }
pub struct WrappedHttpRequest {
request: HyperRequest<Fresh>
}
#[derive(Debug)] #[derive(Debug)]
struct LoadError { struct LoadError {
pub url: ServoUrl, pub url: ServoUrl,
@ -490,14 +486,14 @@ fn obtain_response(request_factory: &NetworkHttpRequestFactory,
let connect_start = precise_time_ms(); let connect_start = precise_time_ms();
let req = try!(request_factory.create(connection_url.clone(), method.clone(), let request = try!(request_factory.create(connection_url.clone(), method.clone(),
headers.clone())); headers.clone()));
let connect_end = precise_time_ms(); let connect_end = precise_time_ms();
let send_start = precise_time_ms(); let send_start = precise_time_ms();
let mut request_writer = match req.request.start() { let mut request_writer = match request.start() {
Ok(streaming) => streaming, Ok(streaming) => streaming,
Err(e) => return Err(LoadError::new(connection_url, Err(e) => return Err(LoadError::new(connection_url,
LoadErrorType::Connection { reason: e.description().to_owned() })), LoadErrorType::Connection { reason: e.description().to_owned() })),