Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-25 09:34:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #13679 - frewsxcv:remove-str-alloc, r=KiChjang

Browse source 
Cleanup logic, remove unnecessary allocations in Request API.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13679)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-10-10 18:53:21 -05:00 • committed by GitHub
commit a618b245ce
1 changed files with 12 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

38
components/script/dom/request.rs
View file

@ -35,6 +35,7 @@ use net_traits::request::Referrer as NetTraitsRequestReferrer;
use net_traits::request::Request as NetTraitsRequest; use net_traits::request::Request as NetTraitsRequest;
use net_traits::request::RequestMode as NetTraitsRequestMode; use net_traits::request::RequestMode as NetTraitsRequestMode;
use net_traits::request::Type as NetTraitsRequestType; use net_traits::request::Type as NetTraitsRequestType;
use std::ascii::AsciiExt;
use std::cell::{Cell, Ref}; use std::cell::{Cell, Ref};
use std::rc::Rc; use std::rc::Rc;
use url::Url; use url::Url;
@ -290,15 +291,12 @@ impl Request {
return Err(Error::Type("Method is forbidden".to_string())); return Err(Error::Type("Method is forbidden".to_string()));
} }
// Step 25.2 // Step 25.2
let method_lower = init_method.to_lower(); let method = match init_method.as_str() {
let method_string = match method_lower.as_str() { Some(s) => normalize_method(s),
Some(s) => s,
None => return Err(Error::Type("Method is not a valid UTF8".to_string())), None => return Err(Error::Type("Method is not a valid UTF8".to_string())),
}; };
let normalized_method = normalize_method(method_string);
// Step 25.3 // Step 25.3
let hyper_method = normalized_method_to_typed_method(&normalized_method); *request.method.borrow_mut() = method;
*request.method.borrow_mut() = hyper_method;
} }
// Step 26 // Step 26
@ -458,28 +456,16 @@ fn net_request_from_global(global: &GlobalScope,
Some(pipeline_id)) Some(pipeline_id))
} }
fn normalized_method_to_typed_method(m: &str) -> HttpMethod {
match m {
"DELETE" => HttpMethod::Delete,
"GET" => HttpMethod::Get,
"HEAD" => HttpMethod::Head,
"OPTIONS" => HttpMethod::Options,
"POST" => HttpMethod::Post,
"PUT" => HttpMethod::Put,
a => HttpMethod::Extension(a.to_string())
}
}
// https://fetch.spec.whatwg.org/#concept-method-normalize // https://fetch.spec.whatwg.org/#concept-method-normalize
fn normalize_method(m: &str) -> String { fn normalize_method(m: &str) -> HttpMethod {
match m { match m {
"delete" => "DELETE".to_string(), m if m.eq_ignore_ascii_case("DELETE") => HttpMethod::Delete,
"get" => "GET".to_string(), m if m.eq_ignore_ascii_case("GET") => HttpMethod::Get,
"head" => "HEAD".to_string(), m if m.eq_ignore_ascii_case("HEAD") => HttpMethod::Head,
"options" => "OPTIONS".to_string(), m if m.eq_ignore_ascii_case("OPTIONS") => HttpMethod::Options,
"post" => "POST".to_string(), m if m.eq_ignore_ascii_case("POST") => HttpMethod::Post,
"put" => "PUT".to_string(), m if m.eq_ignore_ascii_case("PUT") => HttpMethod::Put,
a => a.to_string(), m => HttpMethod::Extension(m.to_string()),
} }
} }