diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-09-16 15:43:54 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-16 15:43:54 -0500 |
commit | 8ccfffaa774a05fa12db09c872cc59c4bf070ab2 (patch) | |
tree | d8beec544be538b07c9dda60dcd2f799c593b074 /components/script/dom | |
parent | 1fee88e59ca3119ceb258317a174d56e9c9dc169 (diff) | |
parent | 924136ee0c1a59ea5a140f58ecae0fd456dd5102 (diff) | |
download | servo-8ccfffaa774a05fa12db09c872cc59c4bf070ab2.tar.gz servo-8ccfffaa774a05fa12db09c872cc59c4bf070ab2.zip |
Auto merge of #13294 - 6112:referrer-typo-fix, r=jdm
Fix most typoes for: "referer" -> "referrer"
Replace most uses of the word "referer" with "referrer", except for `hyper::header::Referer`. Also update the unit tests to compile & pass after those changes.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #13286
<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because they're only typo fixes.
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/13294)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/request.rs | 20 | ||||
-rw-r--r-- | components/script/dom/xmlhttprequest.rs | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index 25f64438a0a..e8eb62c3f05 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -28,7 +28,7 @@ use net_traits::request::CacheMode as NetTraitsRequestCache; use net_traits::request::CredentialsMode as NetTraitsRequestCredentials; use net_traits::request::Destination as NetTraitsRequestDestination; use net_traits::request::RedirectMode as NetTraitsRequestRedirect; -use net_traits::request::Referer as NetTraitsRequestReferer; +use net_traits::request::Referrer as NetTraitsRequestReferrer; use net_traits::request::Request as NetTraitsRequest; use net_traits::request::RequestMode as NetTraitsRequestMode; use net_traits::request::Type as NetTraitsRequestType; @@ -154,7 +154,7 @@ impl Request { *request.origin.borrow_mut() = Origin::Client; request.omit_origin_header = temporary_request.omit_origin_header; request.same_origin_data.set(true); - request.referer = temporary_request.referer; + request.referrer = temporary_request.referrer; request.referrer_policy = temporary_request.referrer_policy; request.mode = temporary_request.mode; request.credentials_mode = temporary_request.credentials_mode; @@ -182,7 +182,7 @@ impl Request { // Step 13.2 request.omit_origin_header.set(false); // Step 13.3 - *request.referer.borrow_mut() = NetTraitsRequestReferer::Client; + *request.referrer.borrow_mut() = NetTraitsRequestReferrer::Client; // Step 13.4 request.referrer_policy.set(None); } @@ -193,7 +193,7 @@ impl Request { let ref referrer = init_referrer.0; // Step 14.2 if referrer.is_empty() { - *request.referer.borrow_mut() = NetTraitsRequestReferer::NoReferer; + *request.referrer.borrow_mut() = NetTraitsRequestReferrer::NoReferrer; } else { // Step 14.3 let parsed_referrer = base_url.join(referrer); @@ -207,7 +207,7 @@ impl Request { if parsed_referrer.cannot_be_a_base() && parsed_referrer.scheme() == "about" && parsed_referrer.path() == "client" { - *request.referer.borrow_mut() = NetTraitsRequestReferer::Client; + *request.referrer.borrow_mut() = NetTraitsRequestReferrer::Client; } else { // Step 14.6 if parsed_referrer.origin() != origin { @@ -215,7 +215,7 @@ impl Request { "RequestInit's referrer has invalid origin".to_string())); } // Step 14.7 - *request.referer.borrow_mut() = NetTraitsRequestReferer::RefererUrl(parsed_referrer); + *request.referrer.borrow_mut() = NetTraitsRequestReferrer::ReferrerUrl(parsed_referrer); } } } @@ -538,11 +538,11 @@ impl RequestMethods for Request { // https://fetch.spec.whatwg.org/#dom-request-referrer fn Referrer(&self) -> USVString { let r = self.request.borrow(); - let referrer = r.referer.borrow(); + let referrer = r.referrer.borrow(); USVString(match &*referrer { - &NetTraitsRequestReferer::NoReferer => String::from("no-referrer"), - &NetTraitsRequestReferer::Client => String::from("client"), - &NetTraitsRequestReferer::RefererUrl(ref u) => { + &NetTraitsRequestReferrer::NoReferrer => String::from("no-referrer"), + &NetTraitsRequestReferrer::Client => String::from("client"), + &NetTraitsRequestReferrer::ReferrerUrl(ref u) => { let u_c = u.clone(); u_c.into_string() } diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index c23b97b48d7..d034b60aebd 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -593,7 +593,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest { credentials_mode: credentials_mode, use_url_credentials: use_url_credentials, origin: self.global().r().get_url(), - referer_url: self.referrer_url.clone(), + referrer_url: self.referrer_url.clone(), referrer_policy: self.referrer_policy.clone(), pipeline_id: self.pipeline_id(), }; |