aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/util/url.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/util/url.rs')
-rw-r--r--src/components/util/url.rs96
1 files changed, 48 insertions, 48 deletions
diff --git a/src/components/util/url.rs b/src/components/util/url.rs
index 7c13e124897..ccedb77918f 100644
--- a/src/components/util/url.rs
+++ b/src/components/util/url.rs
@@ -17,21 +17,21 @@ Create a URL object from a string. Does various helpful browsery things like
*/
// TODO: about:failure->
-pub fn try_parse_url(str_url: &str, base_url: Option<std_url::Url>) -> Result<std_url::Url, ~str> {
- let str_url = str_url.trim_chars(&[' ', '\t', '\n', '\r', '\x0C']).to_owned();
- let schm = std_url::get_scheme(str_url);
+pub fn try_parse_url(str_url: &str, base_url: Option<std_url::Url>) -> Result<std_url::Url, String> {
+ let str_url = str_url.trim_chars(&[' ', '\t', '\n', '\r', '\x0C']).to_string();
+ let schm = std_url::get_scheme(str_url.as_slice());
let str_url = match schm {
Err(_) => {
if base_url.is_none() {
// Assume we've been given a file path. If it's absolute just return
// it, otherwise make it absolute with the cwd.
- if str_url.starts_with("/") {
- "file://".to_owned() + str_url
+ if str_url.as_slice().starts_with("/") {
+ format!("file://{}", str_url)
} else {
let mut path = os::getcwd();
path.push(str_url);
// FIXME (#1094): not the right way to transform a path
- "file://".to_owned() + path.display().to_str()
+ format!("file://{}", path.display().to_str())
}
} else {
let base_url = base_url.unwrap();
@@ -41,17 +41,17 @@ pub fn try_parse_url(str_url: &str, base_url: Option<std_url::Url>) -> Result<st
new_url.query = vec!();
new_url.fragment = None;
- if str_url.starts_with("//") {
- new_url.scheme + ":" + str_url
- } else if base_url.path.is_empty() || str_url.starts_with("/") {
- new_url.path = "/".to_owned();
- new_url.to_str() + str_url.trim_left_chars('/')
- } else if str_url.starts_with("#") {
- new_url.to_str() + str_url
+ if str_url.as_slice().starts_with("//") {
+ format!("{}:{}", new_url.scheme, str_url)
+ } else if base_url.path.is_empty() || str_url.as_slice().starts_with("/") {
+ new_url.path = "/".to_string();
+ format!("{}{}", new_url, str_url.as_slice().trim_left_chars('/'))
+ } else if str_url.as_slice().starts_with("#") {
+ format!("{}{}", new_url, str_url)
} else { // relative path
- let base_path = base_url.path.trim_right_chars(|c: char| c != '/');
- new_url.path = base_path.to_owned();
- new_url.to_str() + str_url
+ let base_path = base_url.path.as_slice().trim_right_chars(|c: char| c != '/');
+ new_url.path = base_path.to_string();
+ format!("{}{}", new_url, str_url)
}
}
},
@@ -66,24 +66,24 @@ pub fn try_parse_url(str_url: &str, base_url: Option<std_url::Url>) -> Result<st
let mut path = os::self_exe_path().expect("can't get exe path");
path.push("../src/test/html/failure.html");
// FIXME (#1094): not the right way to transform a path
- "file://".to_owned() + path.display().to_str()
+ format!("file://{}", path.display().to_str())
}
// TODO: handle the rest of the about: pages
- _ => str_url.to_owned()
+ _ => str_url.to_string()
}
},
"data" => {
// Drop whitespace within data: URLs, e.g. newlines within a base64
// src="..." block. Whitespace intended as content should be
// %-encoded or base64'd.
- str_url.chars().filter(|&c| !c.is_whitespace()).collect()
+ str_url.as_slice().chars().filter(|&c| !c.is_whitespace()).collect()
},
- _ => str_url.to_owned()
+ _ => str_url.to_string()
}
}
};
- std_url::from_str(str_url)
+ std_url::from_str(str_url.as_slice())
}
pub fn parse_url(str_url: &str, base_url: Option<std_url::Url>) -> std_url::Url {
@@ -102,10 +102,10 @@ mod parse_url_tests {
let file = "local.html";
let url = parse_url(file, None);
debug!("url: {:?}", url);
- assert!("file" == url.scheme);
+ assert!("file" == url.scheme.as_slice());
let path = os::getcwd();
// FIXME (#1094): not the right way to transform a path
- assert!(url.path.contains(path.display().to_str()));
+ assert!(url.path.as_slice().contains(path.display().to_str().as_slice()));
}
#[test]
@@ -114,9 +114,9 @@ mod parse_url_tests {
let old_url = parse_url(old_str, None);
let new_str = "index.html";
let new_url = parse_url(new_str, Some(old_url));
- assert!("http" == new_url.scheme);
- assert!("example.com" == new_url.host);
- assert!("/index.html" == new_url.path);
+ assert!("http" == new_url.scheme.as_slice());
+ assert!("example.com" == new_url.host.as_slice());
+ assert!("/index.html" == new_url.path.as_slice());
}
#[test]
@@ -125,9 +125,9 @@ mod parse_url_tests {
let old_url = parse_url(old_str, None);
let new_str = "index.html";
let new_url = parse_url(new_str, Some(old_url));
- assert!("http" == new_url.scheme);
- assert!("example.com" == new_url.host);
- assert!("/index.html" == new_url.path);
+ assert!("http" == new_url.scheme.as_slice());
+ assert!("example.com" == new_url.host.as_slice());
+ assert!("/index.html" == new_url.path.as_slice());
}
#[test]
@@ -136,9 +136,9 @@ mod parse_url_tests {
let old_url = parse_url(old_str, None);
let new_str = "crumpet.html";
let new_url = parse_url(new_str, Some(old_url));
- assert!("http" == new_url.scheme);
- assert!("example.com" == new_url.host);
- assert!("/crumpet.html" == new_url.path);
+ assert!("http" == new_url.scheme.as_slice());
+ assert!("example.com" == new_url.host.as_slice());
+ assert!("/crumpet.html" == new_url.path.as_slice());
}
#[test]
@@ -147,9 +147,9 @@ mod parse_url_tests {
let old_url = parse_url(old_str, None);
let new_str = "crumpet.html";
let new_url = parse_url(new_str, Some(old_url));
- assert!("http" == new_url.scheme);
- assert!("example.com" == new_url.host);
- assert!("/snarf/crumpet.html" == new_url.path);
+ assert!("http" == new_url.scheme.as_slice());
+ assert!("example.com" == new_url.host.as_slice());
+ assert!("/snarf/crumpet.html" == new_url.path.as_slice());
}
#[test]
@@ -159,10 +159,10 @@ mod parse_url_tests {
let new_str = "#top";
let new_url = parse_url(new_str, Some(old_url));
- assert!("http" == new_url.scheme);
- assert!("example.com" == new_url.host);
- assert!("/index.html" == new_url.path);
- assert!(new_url.fragment == Some("top".to_owned()));
+ assert!("http" == new_url.scheme.as_slice());
+ assert!("example.com" == new_url.host.as_slice());
+ assert!("/index.html" == new_url.path.as_slice());
+ assert!(new_url.fragment == Some("top".to_string()));
}
#[test]
@@ -174,12 +174,12 @@ mod parse_url_tests {
let new_str = "#top";
let new_url = parse_url(new_str, Some(old_url));
- assert!("http" == new_url.scheme);
- assert!(new_url.user == Some(UserInfo { user: "foo".to_owned(), pass: Some("bar".to_owned()) }));
- assert!("example.com" == new_url.host);
- assert!(new_url.port == Some("8080".to_owned()));
- assert!("/index.html" == new_url.path);
- assert!(new_url.fragment == Some("top".to_owned()));
+ assert!("http" == new_url.scheme.as_slice());
+ assert!(new_url.user == Some(UserInfo { user: "foo".to_string(), pass: Some("bar".to_string()) }));
+ assert!("example.com" == new_url.host.as_slice());
+ assert!(new_url.port == Some("8080".to_string()));
+ assert!("/index.html" == new_url.path.as_slice());
+ assert!(new_url.fragment == Some("top".to_string()));
}
#[test]
@@ -188,9 +188,9 @@ mod parse_url_tests {
let old_url = parse_url(old_str, None);
let new_str = "//example.com/crumpet.html";
let new_url = parse_url(new_str, Some(old_url));
- assert!("https" == new_url.scheme);
- assert!("example.com" == new_url.host);
- assert!("/crumpet.html" == new_url.path);
+ assert!("https" == new_url.scheme.as_slice());
+ assert!("example.com" == new_url.host.as_slice());
+ assert!("/crumpet.html" == new_url.path.as_slice());
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-03 04:14:17 +0000