diff options
author | Corey Farwell <coreyf@rwell.org> | 2016-11-09 18:30:30 -0500 |
---|---|---|
committer | Corey Farwell <coreyf@rwell.org> | 2016-11-09 18:30:30 -0500 |
commit | bf8752ac9ed6f22c799557bed01655eebdd1c4e9 (patch) | |
tree | 6cd89497bca987bda7ffff10ae7f4a00e2338837 /components/script/dom/htmlscriptelement.rs | |
parent | 35f328d7174c93bb6ef5913a206496779fb8d3bf (diff) | |
download | servo-bf8752ac9ed6f22c799557bed01655eebdd1c4e9.tar.gz servo-bf8752ac9ed6f22c799557bed01655eebdd1c4e9.zip |
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.
Diffstat (limited to 'components/script/dom/htmlscriptelement.rs')
-rw-r--r-- | components/script/dom/htmlscriptelement.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 3b2057e4338..e59ba27433b 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -33,7 +33,7 @@ use ipc_channel::ipc; use ipc_channel::router::ROUTER; use js::jsval::UndefinedValue; use net_traits::{FetchMetadata, FetchResponseListener, Metadata, NetworkError}; -use net_traits::request::{CORSSettings, CredentialsMode, Destination, RequestInit, RequestMode, Type as RequestType}; +use net_traits::request::{CorsSettings, CredentialsMode, Destination, RequestInit, RequestMode, Type as RequestType}; use network_listener::{NetworkListener, PreInvoke}; use servo_atoms::Atom; use std::ascii::AsciiExt; @@ -221,7 +221,7 @@ impl PreInvoke for ScriptContext {} /// https://html.spec.whatwg.org/multipage/#fetch-a-classic-script fn fetch_a_classic_script(script: &HTMLScriptElement, url: Url, - cors_setting: Option<CORSSettings>, + cors_setting: Option<CorsSettings>, character_encoding: EncodingRef) { let doc = document_from_node(script); @@ -233,13 +233,13 @@ fn fetch_a_classic_script(script: &HTMLScriptElement, // https://html.spec.whatwg.org/multipage/#create-a-potential-cors-request // Step 1 mode: match cors_setting { - Some(_) => RequestMode::CORSMode, - None => RequestMode::NoCORS, + Some(_) => RequestMode::CorsMode, + None => RequestMode::NoCors, }, // https://html.spec.whatwg.org/multipage/#create-a-potential-cors-request // Step 3-4 credentials_mode: match cors_setting { - Some(CORSSettings::Anonymous) => CredentialsMode::CredentialsSameOrigin, + Some(CorsSettings::Anonymous) => CredentialsMode::CredentialsSameOrigin, _ => CredentialsMode::Include, }, origin: doc.url().clone(), @@ -358,8 +358,8 @@ impl HTMLScriptElement { // Step 14. let cors_setting = match self.GetCrossOrigin() { - Some(ref s) if *s == "anonymous" => Some(CORSSettings::Anonymous), - Some(ref s) if *s == "use-credentials" => Some(CORSSettings::UseCredentials), + Some(ref s) if *s == "anonymous" => Some(CorsSettings::Anonymous), + Some(ref s) if *s == "use-credentials" => Some(CorsSettings::UseCredentials), None => None, _ => unreachable!() }; |