From 6881776d81800cd206ca1a6579f2ea56f901ff20 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 10 Apr 2015 11:54:44 +0200 Subject: [PATCH] Avoid virtual calls when loading files. --- components/net/file_loader.rs | 6 +++--- 1 file 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 { +fn read_block(reader: &mut File) -> Result { 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 { } } -fn read_all(reader: &mut io::Read, progress_chan: &Sender) +fn read_all(reader: &mut File, progress_chan: &Sender) -> Result<(), String> { loop { match try!(read_block(reader)) {