Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update to latest Rust.

Browse source
This commit is contained in:
Jack Moffitt 2013-07-08 18:41:33 -06:00
parent e0e5e1a2a7
commit 870db39836
75 changed files with 539 additions and 626 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/util/url.rs
View file

@ -44,9 +44,10 @@ pub fn make_url(str_url: ~str, current_url: Option<Url>) -> Url {
for current_url.path.split_iter('/').advance |p| {
path.push(p.to_str());
}
let path = path; // FIXME: borrow checker workaround
let path = path.init();
let path = (path.map(|x| copy *x) + [str_url]).connect("/");
let mut path = path.iter().transform(|x| copy *x).collect::<~[~str]>();
path.push(str_url);
let path = path.connect("/");
current_url.scheme + "://" + current_url.host + path
}