aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/fetch/request.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-06-14 03:55:56 -0600
committerbors-servo <metajack+bors@gmail.com>2015-06-14 03:55:56 -0600
commitdb2eb36e19581eee83247160bbb03e2a671d0479 (patch)
treeabfa2d7411a0f95a2c3a610c7c2417678b79b121 /components/net/fetch/request.rs
parentbedfa74b1f66a87dac00c46ac6560fa012f033d9 (diff)
parentb49bd796253ea6b966e7ac44f24e45929de03f7a (diff)
downloadservo-db2eb36e19581eee83247160bbb03e2a671d0479.tar.gz
servo-db2eb36e19581eee83247160bbb03e2a671d0479.zip
Auto merge of #6325 - Ms2ger:from_str, r=nox
The former appears to be preferred. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6325) <!-- Reviewable:end -->
Diffstat (limited to 'components/net/fetch/request.rs')
-rw-r--r--components/net/fetch/request.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/net/fetch/request.rs b/components/net/fetch/request.rs
index 2e1c53a8c77..4add42400fc 100644
--- a/components/net/fetch/request.rs
+++ b/components/net/fetch/request.rs
@@ -184,7 +184,7 @@ impl Request {
}
// Step 2
if self.context != Context::Fetch && !self.headers.has::<AcceptLanguage>() {
- self.headers.set(AcceptLanguage(vec![qitem(Language::from_str("en-US").unwrap())]));
+ self.headers.set(AcceptLanguage(vec![qitem("en-US".parse().unwrap())]));
}
// TODO: Figure out what a Priority object is
// Step 3