From fa64e18a549f66c4ddab53627db573b7d3fa371c Mon Sep 17 00:00:00 2001 From: Mathijs van de Nes Date: Tue, 20 Jan 2015 10:04:18 +0100 Subject: [PATCH] Remove log dependency --- Cargo.toml | 3 +-- src/lib.rs | 1 - src/reader_spec.rs | 1 - src/util.rs | 5 ++++- src/writer.rs | 6 ++---- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 44f4d88e..eb055633 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "zip" -version = "0.0.6" +version = "0.0.7" authors = ["Mathijs van de Nes "] license = "MIT" repository = "https://github.com/mvdnes/zip-rs.git" @@ -13,7 +13,6 @@ Library to support the reading and writing of zip files. flate2 = "*" bzip2 = "*" time = "*" -log = "*" [[bin]] name = "extract" diff --git a/src/lib.rs b/src/lib.rs index b95c1c3c..4ff26e62 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,7 +4,6 @@ #![warn(missing_docs)] #![allow(unstable)] -#[macro_use] extern crate log; extern crate time; extern crate flate2; extern crate bzip2; diff --git a/src/reader_spec.rs b/src/reader_spec.rs index 94e9e1ae..bcee4d96 100644 --- a/src/reader_spec.rs +++ b/src/reader_spec.rs @@ -95,7 +95,6 @@ fn parse_extra_field(_file: &mut ZipFile, data: &[u8]) -> ZipResult<()> { let kind = try!(reader.read_le_u16()); let len = try!(reader.read_le_u16()); - debug!("Parsing extra block {:04x}", kind); match kind { _ => try!(reader.seek(len as i64, io::SeekCur)), diff --git a/src/util.rs b/src/util.rs index f7a67a3e..fae5d8ee 100644 --- a/src/util.rs +++ b/src/util.rs @@ -23,7 +23,10 @@ pub fn msdos_datetime_to_tm(time: u16, date: u16) -> Tm match time::strptime(&*datetime, format) { Ok(tm) => tm, - Err(m) => { debug!("Failed parsing date: {}", m); time::empty_tm() }, + Err(m) => { + let _ = write!(&mut ::std::io::stdio::stderr(), "Failed parsing date: {}", m); + time::empty_tm() + }, } } diff --git a/src/writer.rs b/src/writer.rs index 7195b11c..cc6ae6c1 100644 --- a/src/writer.rs +++ b/src/writer.rs @@ -206,10 +206,8 @@ impl Drop for ZipWriter { if !self.inner.is_closed() { - match self.finalize() - { - Ok(_) => {}, - Err(e) => warn!("ZipWriter drop failed: {:?}", e), + if let Err(e) = self.finalize() { + let _ = write!(&mut ::std::io::stdio::stderr(), "ZipWriter drop failed: {:?}", e); } } }