Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-15 16:00:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade Rust.

Browse source
This commit is contained in:
Jack Moffitt 2014-06-01 00:21:53 -06:00
parent 2ae671b5aa
commit 629c4c6afe
148 changed files with 992 additions and 967 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/net/http_loader.rs
View file

@ -18,7 +18,7 @@ pub fn factory() -> LoaderTask {
f
}
fn send_error(url: Url, err: ~str, start_chan: Sender<LoadResponse>) {
fn send_error(url: Url, err: String, start_chan: Sender<LoadResponse>) {
start_sending(start_chan, Metadata::default(url)).send(Done(Err(err)));
}
@ -36,18 +36,18 @@ fn load(load_data: LoadData, start_chan: Sender<LoadResponse>) {
iters = iters + 1;
if iters > max_redirects {
send_error(url, "too many redirects".to_owned(), start_chan);
send_error(url, "too many redirects".to_string(), start_chan);
return;
}
if redirected_to.contains(&url) {
send_error(url, "redirect loop".to_owned(), start_chan);
send_error(url, "redirect loop".to_string(), start_chan);
return;
}
redirected_to.insert(url.clone());
if "http" != url.scheme {
if "http" != url.scheme.as_slice() {
let s = format!("{:s} request, but we don't support that scheme", url.scheme);
send_error(url, s, start_chan);
return;
@ -59,7 +59,7 @@ fn load(load_data: LoadData, start_chan: Sender<LoadResponse>) {
let mut writer = match request {
Ok(w) => box w,
Err(e) => {
send_error(url, e.desc.to_owned(), start_chan);
send_error(url, e.desc.to_string(), start_chan);
return;
}
};
@ -74,7 +74,7 @@ fn load(load_data: LoadData, start_chan: Sender<LoadResponse>) {
writer.headers.content_length = Some(data.len());
match writer.write(data.clone().into_bytes().as_slice()) {
Err(e) => {
send_error(url, e.desc.to_owned(), start_chan);
send_error(url, e.desc.to_string(), start_chan);
return;
}
_ => {}
@ -85,7 +85,7 @@ fn load(load_data: LoadData, start_chan: Sender<LoadResponse>) {
let mut response = match writer.read_response() {
Ok(r) => r,
Err((_, e)) => {
send_error(url, e.desc.to_owned(), start_chan);
send_error(url, e.desc.to_string(), start_chan);
return;
}
};