diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-01-20 07:54:46 -0700 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-01-20 07:54:46 -0700 |
commit | 94ebc7c32d5ce58ada3f9d8ffdb60cc025eb5997 (patch) | |
tree | d4982abff1dae6119889edb12e7cc7623105396b /components/script/dom/urlhelper.rs | |
parent | 89645391bf42edd9977ed1b6f9b430ad786f209e (diff) | |
parent | 01ed338746ae71493984259335197e6b66daec45 (diff) | |
download | servo-94ebc7c32d5ce58ada3f9d8ffdb60cc025eb5997.tar.gz servo-94ebc7c32d5ce58ada3f9d8ffdb60cc025eb5997.zip |
auto merge of #4682 : servo/servo/to_owned, r=jdm
into_string has been removed from Rust.
Diffstat (limited to 'components/script/dom/urlhelper.rs')
-rw-r--r-- | components/script/dom/urlhelper.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/components/script/dom/urlhelper.rs b/components/script/dom/urlhelper.rs index 8f3a005127d..290fede857c 100644 --- a/components/script/dom/urlhelper.rs +++ b/components/script/dom/urlhelper.rs @@ -5,6 +5,8 @@ use servo_util::str::DOMString; use url::Url; +use std::borrow::ToOwned; + pub struct UrlHelper; impl UrlHelper { @@ -14,16 +16,16 @@ impl UrlHelper { pub fn Search(url: &Url) -> DOMString { match url.query { - None => "".into_string(), - Some(ref query) if query.as_slice() == "" => "".into_string(), + None => "".to_owned(), + Some(ref query) if query.as_slice() == "" => "".to_owned(), Some(ref query) => format!("?{}", query) } } pub fn Hash(url: &Url) -> DOMString { match url.fragment { - None => "".into_string(), - Some(ref hash) if hash.as_slice() == "" => "".into_string(), + None => "".to_owned(), + Some(ref hash) if hash.as_slice() == "" => "".to_owned(), Some(ref hash) => format!("#{}", hash) } } |