diff options
-rw-r--r-- | src/components/net/file_loader.rs | 38 | ||||
-rw-r--r-- | src/components/net/http_loader.rs | 6 |
2 files changed, 22 insertions, 22 deletions
diff --git a/src/components/net/file_loader.rs b/src/components/net/file_loader.rs index b77f7fb763e..535b44d0c08 100644 --- a/src/components/net/file_loader.rs +++ b/src/components/net/file_loader.rs @@ -10,23 +10,23 @@ use std::task; static READ_SIZE: uint = 1024; pub fn factory() -> LoaderTask { - let f: LoaderTask = |url, progress_chan| { - assert!("file" == url.scheme); - do task::spawn { - // FIXME: Resolve bug prevents us from moving the path out of the URL. - match file_reader(&Path(url.path)) { - Ok(reader) => { - while !reader.eof() { - let data = reader.read_bytes(READ_SIZE); - progress_chan.send(Payload(data)); - } - progress_chan.send(Done(Ok(()))); - } - Err(*) => { - progress_chan.send(Done(Err(()))); - } - }; - } - }; - f + let f: LoaderTask = |url, progress_chan| { + assert!("file" == url.scheme); + do task::spawn { + // FIXME: Resolve bug prevents us from moving the path out of the URL. + match file_reader(&Path(url.path)) { + Ok(reader) => { + while !reader.eof() { + let data = reader.read_bytes(READ_SIZE); + progress_chan.send(Payload(data)); + } + progress_chan.send(Done(Ok(()))); + } + Err(*) => { + progress_chan.send(Done(Err(()))); + } + }; + } + }; + f } diff --git a/src/components/net/http_loader.rs b/src/components/net/http_loader.rs index e06fe90ccf7..de6a35d3e5f 100644 --- a/src/components/net/http_loader.rs +++ b/src/components/net/http_loader.rs @@ -13,12 +13,12 @@ use http::headers::HeaderEnum; use std::rt::io::Reader; pub fn factory() -> LoaderTask { - let f: LoaderTask = |url, progress_chan| { + let f: LoaderTask = |url, progress_chan| { let url = Cell::new(url); let progress_chan = Cell::new(progress_chan); spawn(|| load(url.take(), progress_chan.take())) - }; - f + }; + f } fn load(url: Url, progress_chan: Chan<ProgressMsg>) { |