auto merge of #1541 : teosz/servo/master, r=metajack

This commit is contained in:
bors-servo 2014-01-23 16:31:22 -08:00
commit a8d785cbbc

View file

@ -17,7 +17,7 @@ Create a URL object from a string. Does various helpful browsery things like
*/ */
// TODO: about:failure-> // TODO: about:failure->
pub fn make_url(str_url: ~str, current_url: Option<Url>) -> Url { pub fn make_url(str_url: &str, current_url: Option<Url>) -> Url {
let str_url = str_url.trim_chars(& &[' ', '\t', '\n', '\r', '\x0C']).to_owned(); let str_url = str_url.trim_chars(& &[' ', '\t', '\n', '\r', '\x0C']).to_owned();
let schm = url::get_scheme(str_url); let schm = url::get_scheme(str_url);
let str_url = match schm { let str_url = match schm {