diff options
Diffstat (limited to 'src/components/net/file_loader.rs')
| -rw-r--r-- | src/components/net/file_loader.rs | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/components/net/file_loader.rs b/src/components/net/file_loader.rs index 4a63ac5dcf0..336df6e0193 100644 --- a/src/components/net/file_loader.rs +++ b/src/components/net/file_loader.rs @@ -3,7 +3,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use resource_task::{ProgressMsg, Metadata, Payload, Done, LoaderTask, start_sending}; -use servo_util::io::result; use std::io; use std::io::File; @@ -11,14 +10,11 @@ use servo_util::task::spawn_named; static READ_SIZE: uint = 1024; -fn read_all(reader: &mut io::Stream, progress_chan: &SharedChan<ProgressMsg>) +fn read_all(reader: &mut io::Stream, progress_chan: &Chan<ProgressMsg>) -> Result<(), ()> { loop { - match (result(|| { - let data = reader.read_bytes(READ_SIZE); - progress_chan.send(Payload(data)); - })) { - Ok(()) => (), + match (reader.read_bytes(READ_SIZE)) { + Ok(data) => progress_chan.send(Payload(data)), Err(e) => match e.kind { io::EndOfFile => return Ok(()), _ => return Err(()), @@ -32,14 +28,12 @@ pub fn factory() -> LoaderTask { assert!("file" == url.scheme); let progress_chan = start_sending(start_chan, Metadata::default(url.clone())); spawn_named("file_loader", proc() { - // ignore_io_error causes us to get None instead of a task failure. - let _guard = io::ignore_io_error(); match File::open_mode(&Path::new(url.path), io::Open, io::Read) { - Some(ref mut reader) => { + Ok(ref mut reader) => { let res = read_all(reader as &mut io::Stream, &progress_chan); progress_chan.send(Done(res)); } - None => { + Err(_) => { progress_chan.send(Done(Err(()))); } }; |