aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2015-02-02 17:55:11 +0000
committerJosh Matthews <josh@joshmatthews.net>2015-02-04 13:35:05 +0000
commit94de93b3a32940167b5798c150753e4181e9c70b (patch)
tree6766090872fefd8e3ebfebf90d8360760fd7fdb2
parent1dbbc1b72da85d9c14ba103f8a4db6c4f3536877 (diff)
downloadservo-94de93b3a32940167b5798c150753e4181e9c70b.tar.gz
servo-94de93b3a32940167b5798c150753e4181e9c70b.zip
Rename some variables for clarity.
-rw-r--r--components/net/http_loader.rs4
-rw-r--r--components/net/resource_task.rs8
2 files changed, 6 insertions, 6 deletions
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index f6590ab2292..95ecd161aff 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -120,9 +120,9 @@ reason: \"certificate verify failed\" }]";
let (tx, rx) = channel();
cookies_chan.send(ControlMsg::GetCookiesForUrl(url.clone(), tx, CookieSource::HTTP));
- if let Some(cookies) = rx.recv().unwrap() {
+ if let Some(cookie_list) = rx.recv().unwrap() {
let mut v = Vec::new();
- v.push(cookies.into_bytes());
+ v.push(cookie_list.into_bytes());
load_data.headers.set_raw("Cookie".to_owned(), v);
}
diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs
index b9c22b996e8..cdd62c67abf 100644
--- a/components/net/resource_task.rs
+++ b/components/net/resource_task.rs
@@ -228,11 +228,11 @@ impl ResourceManager {
ControlMsg::Load(load_data) => {
self.load(load_data)
}
- ControlMsg::SetCookiesForUrl(request, cookies, source) => {
- let header = Header::parse_header([cookies.into_bytes()].as_slice());
+ ControlMsg::SetCookiesForUrl(request, cookie_list, source) => {
+ let header = Header::parse_header([cookie_list.into_bytes()].as_slice());
if let Some(SetCookie(cookies)) = header {
- for cookie in cookies.into_iter() {
- if let Some(cookie) = cookie::Cookie::new_wrapped(cookie, &request, source) {
+ for bare_cookie in cookies.into_iter() {
+ if let Some(cookie) = cookie::Cookie::new_wrapped(bare_cookie, &request, source) {
self.cookie_storage.push(cookie, source);
}
}