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

Removes HttpRequest, adds HttpResponse wrapper

Browse source 
The HttpRequest trait doesn't make sense, on further reflection. Rather,
just modify the method signature on the requester. The hyper request was
only being used to mutate it's headers anyway.

servo/servo#6727
This commit is contained in:
Sam Gibson 2015-08-09 23:33:43 +12:00
parent 7633cd54c2
commit 81fe5938bf
2 changed files with 91 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/unit/net/http_loader.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use net::http_loader::{load, LoadError, HttpRequester, HttpRequest};
use net::http_loader::{load, LoadError, HttpRequester, HttpResponse};
use url::Url;
use std::sync::{Arc, Mutex};
use ipc_channel::ipc;
@ -10,15 +10,12 @@ use net_traits::LoadData;
use net::hsts::HSTSList;
use hyper::client::Response;
use hyper::method::Method;
use hyper::header::Headers;
struct MockHttpRequester;
impl HttpRequester for MockHttpRequester {
fn build(&self, url: Url, _: Method) -> Result<Box<HttpRequest>, LoadError> {
Err(LoadError::Connection(url.clone(), "shouldn't connect".to_string()))
}
fn send(&self, _: Box<HttpRequest>) -> Result<Response, LoadError> {
fn send(&self, _: &Url, _: &Method, _: &Headers, _: &Option<Vec<u8>>) -> Result<Box<HttpResponse>, LoadError> {
Err(LoadError::Connection(Url::parse("http://example.com").unwrap(), "shouldn't connect".to_string()))
}
}