Impl Drop for Lzmawriter

src/error.rs

@@ -32,7 +32,7 @@ impl fmt::Display for LzmaError {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match *self {
 			LzmaError::Io(ref err) => write!(f, "{}", err),
-			_ => write!(f, "{}", self.description()),
+			_ => write!(f, "{}", self.to_string()),
 		}
 	}
 }

src/lib.rs

@@ -41,7 +41,7 @@ pub use writer::LzmaWriter;
 pub use error::LzmaError;
 
 
-pub const EXTREME_PRESET: u32 = (1 << 31);
+pub const EXTREME_PRESET: u32 = 1 << 31;
 
 
 /// Compress `buf` and return the result.

src/writer.rs

@@ -30,7 +30,7 @@ use lzma_stream_wrapper::{LzmaStreamWrapper, LzmaCodeResult};
 const DEFAULT_BUF_SIZE: usize = 4 * 1024;
 
 
-pub struct LzmaWriter<T> {
+pub struct LzmaWriter<T: Write> {
 	inner: T,
 	stream: LzmaStreamWrapper,
 	buffer: Vec<u8>,
@@ -71,9 +71,9 @@ impl<T: Write> LzmaWriter<T> {
 impl<W: Write> LzmaWriter<W> {
 	/// Finalizes the LZMA stream so that it finishes compressing or decompressing.
 	///
-	/// This *must* be called after all writing is done to ensure the last pieces of the compressed
+	/// This can be called after all writing is done to ensure the last pieces of the compressed
 	/// or decompressed stream get written out.
-	pub fn finish(mut self) -> Result<W, LzmaError> {
+	pub fn finish(mut self) -> Result<(), LzmaError> {
 		loop {
 			match self.lzma_code_and_write(&[], lzma_action::LzmaFinish) {
 				Ok(LzmaCodeResult {
@@ -85,8 +85,7 @@ impl<W: Write> LzmaWriter<W> {
 				Err(err) => return Err(err),
 			}
 		}
-
-		Ok(self.inner)
+		Ok(())
 	}
 
 	fn lzma_code_and_write(&mut self, input: &[u8], action: lzma_action) -> Result<LzmaCodeResult, LzmaError> {
@@ -127,3 +126,19 @@ impl<W: Write> Write for LzmaWriter<W> {
 		self.inner.flush()
 	}
 }
+
+impl<W: Write> Drop for LzmaWriter<W> {
+    fn drop(&mut self) {
+        loop {
+			match self.lzma_code_and_write(&[], lzma_action::LzmaFinish) {
+				Ok(LzmaCodeResult {
+					ret: Ok(lzma_ret::LzmaStreamEnd),
+					bytes_read: _,
+					bytes_written: _,
+				}) => break,
+				Ok(_) => continue,
+				Err(_) => break,
+			}
+		}
+    }
+}