From 63d9f99bdf19a9e6fe72a2659f6c2f116c3e33ca Mon Sep 17 00:00:00 2001
From: TatriX <tatrics@gmail.com>
Date: Fri, 12 Jan 2018 00:10:34 +0300
Subject: [PATCH] Update flate2 to the latest version
---
Cargo.toml | 2 +-
src/lib.rs | 10 ++--------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 9df6526..d230fa1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,6 +20,6 @@ name = "example"
path = "examples/main.rs"
[dependencies]
-flate2 = "0.2.13"
base64 = "0.1.1"
xml-rs = "0.3.0"
+flate2 = "1.0.1"
diff --git a/src/lib.rs b/src/lib.rs
index f48223d..8312384 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -802,15 +802,9 @@ fn decode_zlib(data: Vec<u8>) -> Result<Vec<u8>, TiledError> {
}
fn decode_gzip(data: Vec<u8>) -> Result<Vec<u8>, TiledError> {
- let mut gzd = match GzDecoder::new(BufReader::new(&data[..])) {
- Ok(gzd) => gzd,
- Err(e) => return Err(TiledError::DecompressingError(e))
- };
+ let mut gzd = GzDecoder::new(BufReader::new(&data[..]));
let mut data = Vec::new();
- match gzd.read_to_end(&mut data) {
- Ok(_v) => {},
- Err(e) => return Err(TiledError::DecompressingError(e))
- }
+ gzd.read_to_end(&mut data).map_err(|e| TiledError::DecompressingError(e))?;
Ok(data)
}
--
GitLab