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

Auto merge of #14156 - frewsxcv:cors-capitalization, r=KiChjang

Browse source 
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 -->
This commit is contained in:
bors-servo 2016-11-10 14:43:36 -06:00 • committed by GitHub
commit e3f07dfa16
9 changed files with 67 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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,
}
}
}