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

Remove unused header manipulation facilities.

Browse source
This commit is contained in:
Josh Matthews 2016-04-12 18:34:52 -04:00
parent 4cb7dfbc59
commit a761f2bed4
2 changed files with 3 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/net/http_loader.rs
View file

@ -249,16 +249,7 @@ impl HttpResponse for WrappedHttpResponse {
pub trait HttpRequestFactory {
type R: HttpRequest;
fn create(&self, _url: Url, _method: Method) -> Result<Self::R, LoadError> {
panic!()
}
fn create_with_headers(&self, url: Url, method: Method, headers: Headers) -> Result<Self::R, LoadError> {
let mut result = self.create(url, method);
if let Ok(ref mut req) = result {
*req.headers_mut() = headers;
}
result
}
fn create_with_headers(&self, url: Url, method: Method, headers: Headers) -> Result<Self::R, LoadError>;
}
pub struct NetworkHttpRequestFactory {
@ -300,7 +291,6 @@ impl HttpRequestFactory for NetworkHttpRequestFactory {
pub trait HttpRequest {
type R: HttpResponse + 'static;
fn headers_mut(&mut self) -> &mut Headers;
fn send(self, body: &Option<Vec<u8>>) -> Result<Self::R, LoadError>;
}
@ -311,10 +301,6 @@ pub struct WrappedHttpRequest {
impl HttpRequest for WrappedHttpRequest {
type R = WrappedHttpResponse;
fn headers_mut(&mut self) -> &mut Headers {
self.request.headers_mut()
}
fn send(self, body: &Option<Vec<u8>>) -> Result<WrappedHttpResponse, LoadError> {
let url = self.request.url.clone();
let mut request_writer = match self.request.start() {

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

@ -142,13 +142,12 @@ enum ResponseType {
}
struct MockRequest {
headers: Headers,
t: ResponseType
}
impl MockRequest {
fn new(t: ResponseType) -> MockRequest {
MockRequest { headers: Headers::new(), t: t }
MockRequest { t: t }
}
}
@ -175,8 +174,6 @@ fn response_for_request_type(t: ResponseType) -> Result<MockResponse, LoadError>
impl HttpRequest for MockRequest {
type R = MockResponse;
fn headers_mut(&mut self) -> &mut Headers { &mut self.headers }
fn send(self, _: &Option<Vec<u8>>) -> Result<MockResponse, LoadError> {
response_for_request_type(self.t)
}
@ -271,21 +268,18 @@ impl HttpRequestFactory for AssertMustNotIncludeHeadersRequestFactory {
struct AssertMustHaveBodyRequest {
expected_body: Option<Vec<u8>>,
headers: Headers,
t: ResponseType
}
impl AssertMustHaveBodyRequest {
fn new(t: ResponseType, expected_body: Option<Vec<u8>>) -> Self {
AssertMustHaveBodyRequest { expected_body: expected_body, headers: Headers::new(), t: t }
AssertMustHaveBodyRequest { expected_body: expected_body, t: t }
}
}
impl HttpRequest for AssertMustHaveBodyRequest {
type R = MockResponse;
fn headers_mut(&mut self) -> &mut Headers { &mut self.headers }
fn send(self, body: &Option<Vec<u8>>) -> Result<MockResponse, LoadError> {
assert_eq!(self.expected_body, *body);