DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use read_exact from ReadPodExt explicitly

Browse source 
The newely added read_exact from std::..::Read has an incompatible signature
and is not yet stabilized. This ensures that the crate will work on stable and
nightly.
This commit is contained in:
Mathijs van de Nes 2015-09-02 11:52:30 +02:00
parent 6ed5906054
commit c97d6ed760
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/read.rs
View file

@ -195,9 +195,9 @@ fn central_header_to_zip_file<R: Read+io::Seek>(reader: &mut R) -> ZipResult<Zip
try!(reader.read_u16::<LittleEndian>());
try!(reader.read_u32::<LittleEndian>());
let offset = try!(reader.read_u32::<LittleEndian>()) as u64;
let file_name_raw = try!(reader.read_exact(file_name_length));
let extra_field = try!(reader.read_exact(extra_field_length));
let file_comment_raw = try!(reader.read_exact(file_comment_length));
let file_name_raw = try!(ReadPodExt::read_exact(reader, file_name_length));
let extra_field = try!(ReadPodExt::read_exact(reader, extra_field_length));
let file_comment_raw = try!(ReadPodExt::read_exact(reader, file_comment_length));
let file_name = match is_utf8
{

2
src/spec.rs
View file

@ -34,7 +34,7 @@ impl CentralDirectoryEnd
let central_directory_size = try!(reader.read_u32::<LittleEndian>());
let central_directory_offset = try!(reader.read_u32::<LittleEndian>());
let zip_file_comment_length = try!(reader.read_u16::<LittleEndian>()) as usize;
let zip_file_comment = try!(reader.read_exact(zip_file_comment_length));
let zip_file_comment = try!(ReadPodExt::read_exact(reader, zip_file_comment_length));
Ok(CentralDirectoryEnd
{