berkus
/
bincode
mirror of https://git.sr.ht/~stygianentity/bincode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't require BufRead, only Read 

While BufRead is preferable to avoid dog-slow performance, requiring
when no methods are called is also problematic, especially for wrappers
around Read that shouldn't necessarily need to know they're wrapping
BufRead.
This commit is contained in:
Cody P Schafer 2015-03-02 17:23:10 -05:00
parent 5f85e9b19a
commit b9f201c792
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib.rs
View File

@ -17,7 +17,7 @@ pub use writer::{EncoderWriter, EncodingResult, EncodingError};
pub use reader::{DecoderReader, DecodingResult, DecodingError}; pub use reader::{DecoderReader, DecodingResult, DecodingError};
use writer::SizeChecker; use writer::SizeChecker;
use std::io::{Write, BufRead}; use std::io::{Write, Read};
mod writer; mod writer;
mod reader; mod reader;
@ -134,7 +134,7 @@ pub fn encode_into<T: Encodable, W: Write>(t: &T, w: &mut W, size_limit: SizeLim
/// If this returns an `DecodingError`, assume that the buffer that you passed /// If this returns an `DecodingError`, assume that the buffer that you passed
/// in is in an invalid state, as the error could be returned during any point /// in is in an invalid state, as the error could be returned during any point
/// in the reading. /// in the reading.
pub fn decode_from<R: BufRead, T: Decodable>(r: &mut R, size_limit: SizeLimit) -> pub fn decode_from<R: Read, T: Decodable>(r: &mut R, size_limit: SizeLimit) ->
DecodingResult<T> { DecodingResult<T> {
Decodable::decode(&mut reader::DecoderReader::new(r, size_limit)) Decodable::decode(&mut reader::DecoderReader::new(r, size_limit))
} }

6
src/reader.rs
View File

@ -1,4 +1,4 @@
use std::io::{BufRead, Read}; use std::io::Read;
use std::io::Error as IoError; use std::io::Error as IoError;
use std::io::Result as IoResult; use std::io::Result as IoResult;
use std::num::{cast, NumCast}; use std::num::{cast, NumCast};
@ -110,7 +110,7 @@ pub struct DecoderReader<'a, R: 'a> {
read: u64 read: u64
} }
impl<'a, R: BufRead> DecoderReader<'a, R> { impl<'a, R: Read> DecoderReader<'a, R> {
pub fn new(r: &'a mut R, size_limit: SizeLimit) -> DecoderReader<'a, R> { pub fn new(r: &'a mut R, size_limit: SizeLimit) -> DecoderReader<'a, R> {
DecoderReader { DecoderReader {
reader: r, reader: r,
@ -137,7 +137,7 @@ impl <'a, A> DecoderReader<'a, A> {
} }
} }
impl<'a, R: BufRead> Decoder for DecoderReader<'a, R> { impl<'a, R: Read> Decoder for DecoderReader<'a, R> {
type Error = DecodingError; type Error = DecodingError;
fn read_nil(&mut self) -> DecodingResult<()> { fn read_nil(&mut self) -> DecodingResult<()> {