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

Auto merge of #10629 - frewsxcv:flatten, r=Ms2ger

Browse source 
Flatten a couple `net` implementations.

Working on some of the TLS related code in `net` and tried to clean up a couple implementations along the way.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10629)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-15 18:50:39 +05:30
commit f39ec2b15e
2 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

90
components/net/file_loader.rs
View file

@ -72,54 +72,54 @@ pub fn factory(load_data: LoadData,
cancel_listener: CancellationListener) { cancel_listener: CancellationListener) {
assert!(&*load_data.url.scheme == "file"); assert!(&*load_data.url.scheme == "file");
spawn_named("file_loader".to_owned(), move || { spawn_named("file_loader".to_owned(), move || {
let file_path: Result<PathBuf, ()> = load_data.url.to_file_path(); let file_path = match load_data.url.to_file_path() {
match file_path { Ok(file_path) => file_path,
Ok(file_path) => { Err(_) => {
match File::open(&file_path) { send_error(load_data.url, "Could not parse path".to_owned(), senders);
Ok(ref mut reader) => { return;
if cancel_listener.is_cancelled() { },
if let Ok(progress_chan) = get_progress_chan(load_data, file_path, };
senders, classifier, &[]) { let mut file = File::open(&file_path);
let _ = progress_chan.send(Done(Err("load cancelled".to_owned()))); let reader = match file {
} Ok(ref mut reader) => reader,
return; Err(_) => {
} // this should be one of the three errors listed in
match read_block(reader) { // http://doc.rust-lang.org/std/fs/struct.OpenOptions.html#method.open
Ok(ReadStatus::Partial(buf)) => { // but, we'll go for a "file not found!"
let progress_chan = get_progress_chan(load_data, file_path, let url = Url::parse("about:not-found").unwrap();
senders, classifier, &buf).ok().unwrap(); let load_data_404 = LoadData::new(load_data.context, url, None);
progress_chan.send(Payload(buf)).unwrap(); about_loader::factory(load_data_404, senders, classifier, cancel_listener);
let read_result = read_all(reader, &progress_chan, &cancel_listener); return;
if let Ok(load_result) = read_result { }
match load_result { };
LoadResult::Cancelled => return, if cancel_listener.is_cancelled() {
LoadResult::Finished => progress_chan.send(Done(Ok(()))).unwrap(), if let Ok(progress_chan) = get_progress_chan(load_data, file_path,
} senders, classifier, &[]) {
} let _ = progress_chan.send(Done(Err("load cancelled".to_owned())));
} }
Ok(ReadStatus::EOF) => { return;
if let Ok(chan) = get_progress_chan(load_data, file_path, }
senders, classifier, &[]) { match read_block(reader) {
let _ = chan.send(Done(Ok(()))); Ok(ReadStatus::Partial(buf)) => {
} let progress_chan = get_progress_chan(load_data, file_path,
} senders, classifier, &buf).ok().unwrap();
Err(e) => { progress_chan.send(Payload(buf)).unwrap();
send_error(load_data.url, e, senders); let read_result = read_all(reader, &progress_chan, &cancel_listener);
} if let Ok(load_result) = read_result {
}; match load_result {
} LoadResult::Cancelled => return,
Err(_) => { LoadResult::Finished => progress_chan.send(Done(Ok(()))).unwrap(),
// this should be one of the three errors listed in
// http://doc.rust-lang.org/std/fs/struct.OpenOptions.html#method.open
// but, we'll go for a "file not found!"
let url = Url::parse("about:not-found").unwrap();
let load_data_404 = LoadData::new(load_data.context, url, None);
about_loader::factory(load_data_404, senders, classifier, cancel_listener)
} }
} }
} }
Err(_) => { Ok(ReadStatus::EOF) => {
send_error(load_data.url, "Could not parse path".to_owned(), senders); if let Ok(chan) = get_progress_chan(load_data, file_path,
senders, classifier, &[]) {
let _ = chan.send(Done(Ok(())));
}
}
Err(e) => {
send_error(load_data.url, e, senders);
} }
} }
}); });

26
components/net/http_loader.rs
View file

@ -198,19 +198,19 @@ pub trait HttpResponse: Read {
"HTTP/1.1".to_owned() "HTTP/1.1".to_owned()
} }
fn content_encoding(&self) -> Option<Encoding> { fn content_encoding(&self) -> Option<Encoding> {
self.headers().get::<ContentEncoding>().and_then(|h| { let encodings = match self.headers().get::<ContentEncoding>() {
match *h { Some(&ContentEncoding(ref encodings)) => encodings,
ContentEncoding(ref encodings) => { None => return None,
if encodings.contains(&Encoding::Gzip) { };
Some(Encoding::Gzip) if encodings.contains(&Encoding::Gzip) {
} else if encodings.contains(&Encoding::Deflate) { Some(Encoding::Gzip)
Some(Encoding::Deflate) } else if encodings.contains(&Encoding::Deflate) {
} else if encodings.contains(&Encoding::EncodingExt("br".to_owned())) { Some(Encoding::Deflate)
Some(Encoding::EncodingExt("br".to_owned())) } else if encodings.contains(&Encoding::EncodingExt("br".to_owned())) {
} else { None } Some(Encoding::EncodingExt("br".to_owned()))
} } else {
} None
}) }
} }
} }