diff options
| -rw-r--r-- | components/layout/fragment.rs | 12 | ||||
| -rw-r--r-- | components/net/cookie.rs | 5 | ||||
| -rw-r--r-- | components/net/fetch/request.rs | 2 | ||||
| -rw-r--r-- | components/net/resource_task.rs | 5 | ||||
| -rw-r--r-- | components/script/dom/xmlhttprequest.rs | 3 |
5 files changed, 10 insertions, 17 deletions
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index dddf6fa2572..b6af941eceb 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -34,7 +34,6 @@ use std::borrow::ToOwned; use std::cmp::{max, min}; use std::collections::LinkedList; use std::fmt; -use std::str::FromStr; use std::sync::mpsc::Sender; use std::sync::{Arc, Mutex}; use string_cache::Atom; @@ -720,13 +719,10 @@ pub struct TableColumnFragmentInfo { impl TableColumnFragmentInfo { /// Create the information specific to an table column fragment. pub fn new(node: &ThreadSafeLayoutNode) -> TableColumnFragmentInfo { - let span = { - let element = node.as_element(); - element.get_attr(&ns!(""), &atom!("span")).and_then(|string| { - let n: Option<u32> = FromStr::from_str(string).ok(); - n - }).unwrap_or(0) - }; + let element = node.as_element(); + let span = element.get_attr(&ns!(""), &atom!("span")) + .and_then(|string| string.parse().ok()) + .unwrap_or(0); TableColumnFragmentInfo { span: span, } diff --git a/components/net/cookie.rs b/components/net/cookie.rs index e520e0cbcb6..0e6c8fdf9ae 100644 --- a/components/net/cookie.rs +++ b/components/net/cookie.rs @@ -13,7 +13,6 @@ use time::{Tm, now, at, Duration}; use url::Url; use std::borrow::ToOwned; use std::net::{Ipv4Addr, Ipv6Addr}; -use std::str::FromStr; /// A stored cookie that wraps the definition in cookie-rs. This is used to implement /// various behaviours defined in the spec that rely on an associated request URL, @@ -128,8 +127,8 @@ impl Cookie { } if string.ends_with(domain_string) && string.as_bytes()[string.len()-domain_string.len()-1] == b'.' - && Ipv4Addr::from_str(string).is_err() - && Ipv6Addr::from_str(string).is_err() { + && string.parse::<Ipv4Addr>().is_err() + && string.parse::<Ipv6Addr>().is_err() { return true; } false 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 diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs index f888e017220..5b345bb8dcf 100644 --- a/components/net/resource_task.rs +++ b/components/net/resource_task.rs @@ -28,7 +28,6 @@ use std::collections::HashMap; use std::env; use std::fs::File; use std::io::{BufReader, Read}; -use std::str::FromStr; use std::sync::Arc; use std::sync::mpsc::{channel, Receiver, Sender}; @@ -122,8 +121,8 @@ pub fn start_sending_sniffed_opt(start_chan: LoadConsumer, mut metadata: Metadat }); metadata.content_type = classifier.classify(nosniff, check_for_apache_bug, &supplied_type, &partial_body).map(|(toplevel, sublevel)| { - let mime_tp: TopLevel = FromStr::from_str(&toplevel).unwrap(); - let mime_sb: SubLevel = FromStr::from_str(&sublevel).unwrap(); + let mime_tp: TopLevel = toplevel.parse().unwrap(); + let mime_sb: SubLevel = sublevel.parse().unwrap(); ContentType(Mime(mime_tp, mime_sb, vec!())) }); diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 5044feae3b7..5a4992a0061 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -56,7 +56,6 @@ use std::ascii::AsciiExt; use std::borrow::ToOwned; use std::cell::{RefCell, Cell}; use std::default::Default; -use std::str::FromStr; use std::sync::{Mutex, Arc}; use std::sync::mpsc::{channel, Sender, TryRecvError}; use std::thread::sleep_ms; @@ -634,7 +633,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { // https://xhr.spec.whatwg.org/#the-getresponseheader()-method fn GetResponseHeader(self, name: ByteString) -> Option<ByteString> { self.filter_response_headers().iter().find(|h| { - name.eq_ignore_case(&FromStr::from_str(h.name()).unwrap()) + name.eq_ignore_case(&h.name().parse().unwrap()) }).map(|h| { ByteString::new(h.value_string().into_bytes()) }) |