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

Update to new bzip2 code

Browse source
This commit is contained in:
Mathijs van de Nes 2014-12-13 14:12:02 +01:00
parent 22580a768d
commit c7c97b85ad
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/result.rs
View file

@ -31,6 +31,14 @@ impl error::FromError<io::IoError> for ZipError
} }
} }
impl<T> error::FromError<(T, io::IoError)> for ZipError
{
fn from_error((_, err): (T, io::IoError)) -> ZipError
{
error::FromError::from_error(err)
}
}
impl error::Error for ZipError impl error::Error for ZipError
{ {
fn description(&self) -> &str fn description(&self) -> &str

2
src/writer.rs
View file

@ -223,7 +223,7 @@ impl<W: Writer+Seek> GenericZipWriter<W>
{ {
GenericZipWriter::Storer(w) => w, GenericZipWriter::Storer(w) => w,
GenericZipWriter::Deflater(w) => try!(w.finish()), GenericZipWriter::Deflater(w) => try!(w.finish()),
GenericZipWriter::Bzip2(w) => try!(w.unwrap()), GenericZipWriter::Bzip2(w) => try!(w.into_inner()),
GenericZipWriter::Closed => try!(Err(io::standard_error(io::Closed))), GenericZipWriter::Closed => try!(Err(io::standard_error(io::Closed))),
}; };