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 #5631 - Ms2ger:virtual-file, r=jdm

Browse source
This commit is contained in:
bors-servo 2015-04-10 08:14:16 -05:00
commit 9677eb292d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/net/file_loader.rs
View file

@ -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)) {