525616dc31c9368f00192eacef7a5703411bfc6c — DaniĆ«l de Kok 2 months ago c8136a9
Fix compatibility with older Rust versions

See:
https://github.com/alexcrichton/flate2-rs/issues/207
2 files changed, 18 insertions(+), 6 deletions(-)

M Cargo.lock
M sticker/Cargo.toml
M Cargo.lock => Cargo.lock +17 -5
@@ 326,13 326,13 @@   [[package]]
  name = "flate2"
- version = "1.0.11"
+ version = "1.0.9"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
   "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
   "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-  "miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "miniz_oxide_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]


@@ 487,6 487,17 @@ ]
  
  [[package]]
+ name = "miniz_oxide_c_api"
+ version = "0.2.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+  "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+  "miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
  name = "ndarray"
  version = "0.12.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 997,7 1008,7 @@ "conllx 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
   "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
   "finalfusion 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+  "flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
   "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "ndarray 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "ndarray-tensorflow 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",


@@ 1118,7 1129,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
   "curl 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)",
-  "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+  "flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
   "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
   "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
   "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",


@@ 1269,7 1280,7 @@ "checksum filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd7380b54ced79dda72ecc35cc4fbbd1da6bba54afaa37e96fd1c2a308cd469"
  "checksum finalfusion 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "040f6b1d829f76dd459bb5ebb91943a4de06954432eb8aced3b58604b48c3a05"
  "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
- "checksum flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "2adaffba6388640136149e18ed080b77a78611c1e1d6de75aedcdf78df5d4682"
+ "checksum flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "550934ad4808d5d39365e5d61727309bf18b3b02c6c56b729cb92e7dd84bc3d8"
  "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
  "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
  "checksum getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2512b3191f22e2763a5db387f1c9409379772e2050841722eb4a8c4f497bf096"


@@ 1290,6 1301,7 @@ "checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f"
  "checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202"
  "checksum miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7108aff85b876d06f22503dcce091e29f76733b2bfdd91eebce81f5e68203a10"
+ "checksum miniz_oxide_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6c675792957b0d19933816c4e1d56663c341dd9bfa31cb2140ff2267c1d8ecf4"
  "checksum ndarray 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7cf380a8af901ad627594013a3bbac903ae0a6f94e176e47e46b5bbc1877b928"
  "checksum ndarray-parallel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f837a5313776eac07e3361168f461e15cec093a2f4a2790a8b22de4da813f35c"
  "checksum ndarray-tensorflow 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb10c12eff12953850064ea87349e608ae5340a7c077008bfd48e44fe7edc8ac"

M sticker/Cargo.toml => sticker/Cargo.toml +1 -1
@@ 28,4 28,4 @@   [dev-dependencies]
  approx = "0.3"
- flate2 = "1"
+ flate2 = { version = ">= 1.0.0, <1.0.10" }