diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-10 14:43:36 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-10 14:43:36 -0600 |
commit | e3f07dfa1673950f5aad44e1be6d3667172343b6 (patch) | |
tree | eb073837c46ba423b6315a7351e508122e0738b4 /components/script/dom/request.rs | |
parent | 990884be20a4f3e2785280ac3fc7d7e68ecf1b00 (diff) | |
parent | bf8752ac9ed6f22c799557bed01655eebdd1c4e9 (diff) | |
download | servo-e3f07dfa1673950f5aad44e1be6d3667172343b6.tar.gz servo-e3f07dfa1673950f5aad44e1be6d3667172343b6.zip |
Auto merge of #14156 - frewsxcv:cors-capitalization, r=KiChjang
Update CORS naming from 'CORS' to 'Cors'.
As per:
https://aturon.github.io/style/naming/README.html#general-conventions-[rfc-#430]
Acronyms should be considered one word and not all caps.
<!-- 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/14156)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/request.rs')
-rw-r--r-- | components/script/dom/request.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index fa649702259..614c51398e8 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -114,7 +114,7 @@ impl Request { url, false); // Step 5.5 - fallback_mode = Some(NetTraitsRequestMode::CORSMode); + fallback_mode = Some(NetTraitsRequestMode::CorsMode); // Step 5.6 fallback_credentials = Some(NetTraitsRequestCredentials::Omit); } @@ -335,7 +335,7 @@ impl Request { // deep copied headers in Step 27. // Step 30 - if r.request.borrow().mode == NetTraitsRequestMode::NoCORS { + if r.request.borrow().mode == NetTraitsRequestMode::NoCors { let borrowed_request = r.request.borrow(); // Step 30.1 if !is_cors_safelisted_method(&borrowed_request.method.borrow()) { @@ -814,8 +814,8 @@ impl Into<NetTraitsRequestMode> for RequestMode { match self { RequestMode::Navigate => NetTraitsRequestMode::Navigate, RequestMode::Same_origin => NetTraitsRequestMode::SameOrigin, - RequestMode::No_cors => NetTraitsRequestMode::NoCORS, - RequestMode::Cors => NetTraitsRequestMode::CORSMode, + RequestMode::No_cors => NetTraitsRequestMode::NoCors, + RequestMode::Cors => NetTraitsRequestMode::CorsMode, } } } @@ -825,8 +825,8 @@ impl Into<RequestMode> for NetTraitsRequestMode { match self { NetTraitsRequestMode::Navigate => RequestMode::Navigate, NetTraitsRequestMode::SameOrigin => RequestMode::Same_origin, - NetTraitsRequestMode::NoCORS => RequestMode::No_cors, - NetTraitsRequestMode::CORSMode => RequestMode::Cors, + NetTraitsRequestMode::NoCors => RequestMode::No_cors, + NetTraitsRequestMode::CorsMode => RequestMode::Cors, } } } |