aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/file_loader.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/net/file_loader.rs')
-rw-r--r--components/net/file_loader.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/net/file_loader.rs b/components/net/file_loader.rs
index 49a451d2abb..64539c29477 100644
--- a/components/net/file_loader.rs
+++ b/components/net/file_loader.rs
@@ -8,8 +8,8 @@ use mime_classifier::MIMEClassifier;
use resource_task::{start_sending, start_sending_sniffed};
use std::borrow::ToOwned;
-use std::io;
use std::fs::File;
+use std::io::Read;
use std::path::PathBuf;
use std::sync::Arc;
use std::sync::mpsc::Sender;
@@ -22,7 +22,7 @@ enum ReadStatus {
EOF,
}
-fn read_block(reader: &mut io::Read) -> Result<ReadStatus, String> {
+fn read_block(reader: &mut File) -> Result<ReadStatus, String> {
let mut buf = vec![0; READ_SIZE];
match reader.read(buf.as_mut_slice()) {
Ok(0) => return Ok(ReadStatus::EOF),
@@ -34,7 +34,7 @@ fn read_block(reader: &mut io::Read) -> Result<ReadStatus, String> {
}
}
-fn read_all(reader: &mut io::Read, progress_chan: &Sender<ProgressMsg>)
+fn read_all(reader: &mut File, progress_chan: &Sender<ProgressMsg>)
-> Result<(), String> {
loop {
match try!(read_block(reader)) {