Switch back to tokio 0.2

See LucioFranco/tokio-compat-02#1

Cargo.toml

@@ -15,7 +15,7 @@ keywords = ["image", "download"]
 image = "0.23"
 png = "0.16"
 reqwest = { version = "0.10", features = ["gzip"] }
-tokio = { version = "0.3", features = ["rt-multi-thread", "rt", "macros", "time", "fs", "sync"] }
+tokio = { version = "0.2", features = ["rt-threaded", "rt-core", "macros", "rt-util", "time", "fs", "sync"] }
 futures = "0.3"
 custom_error = "1.7"
 structopt = "0.3"

src/encoder/tile_buffer.rs

@@ -93,7 +93,7 @@ pub enum TileBufferMsg {
 
 async fn buffer_tiles(mut encoder: Box<dyn Encoder>) -> TileBuffer {
     let (tile_sender, mut tile_receiver) = mpsc::channel(1024);
-    let (error_sender, error_receiver) = mpsc::channel(1);
+    let (mut error_sender, error_receiver) = mpsc::channel(1);
     tokio::spawn(async move {
         while let Some(msg) = tile_receiver.recv().await {
             match msg {

src/lib.rs

@@ -265,7 +265,7 @@ async fn download_tile(
             Ok(_) => { break; },
             Err(e) => {
                 warn!("{}. Retrying tile download in {:?}.", e, wait_time);
-                tokio::time::sleep(wait_time).await;
+                tokio::time::delay_for(wait_time).await;
                 wait_time *= 2;
             }
         }

src/network.rs

@@ -1,9 +1,8 @@
+use log::debug;
+use reqwest::{Client, header};
 use std::collections::HashMap;
 use std::iter::once;
 use std::path::PathBuf;
-
-use log::debug;
-use reqwest::{Client, header};
 use tokio::fs;
 use url::Url;
 
@@ -17,9 +16,11 @@ use crate::ZoomError;
 pub async fn fetch_uri(uri: &str, http: &Client) -> Result<Vec<u8>, ZoomError> {
     if uri.starts_with("http://") || uri.starts_with("https://") {
         debug!("Loading url: '{}'", uri);
-        let response = http.get(uri).send().await?.error_for_status()?;
+        let response = http.get(uri).send()
+            .await?.error_for_status()?;
         let mut contents = Vec::new();
-        contents.extend(response.bytes().await?);
+        let bytes = response.bytes().await?;
+        contents.extend(bytes);
         debug!("Loaded url: '{}'", uri);
         Ok(contents)
     } else {

tests/local_dezoomifying.rs

@@ -10,15 +10,15 @@ use dezoomify_rs::{Arguments, dezoomify, ZoomError};
 
 /// Dezoom a file locally
 #[ignore] // Ignore this test by default because it's slow in debug mode
-#[tokio::test(flavor = "multi_thread")]
+#[tokio::test(threaded_scheduler)]
 pub async fn custom_size_local_zoomify_tiles() {
     test_image(
         "testdata/zoomify/test_custom_size/ImageProperties.xml",
         "testdata/zoomify/test_custom_size/expected_result.jpg",
     ).await.unwrap()
 }
 
-#[tokio::test(flavor = "multi_thread")]
+#[tokio::test(threaded_scheduler)]
 pub async fn local_generic_tiles() {
     test_image(
         "testdata/generic/map_{{X}}_{{Y}}.jpg",