From 20b8d49b8948b581eeaf82b9cac271ed23121041 Mon Sep 17 00:00:00 2001 From: Mingwei Samuel Date: Tue, 5 Jan 2021 14:17:23 -0800 Subject: [PATCH] Upgrade to reqwest 0.11, tokio 1.0 --- Cargo.toml | 20 ++++++++++---------- src/req/regional_requester.rs | 3 +-- tests/async_tests.rs | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3cfcc9e..e3021c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,19 +25,19 @@ nightly = [ "parking_lot/nightly" ] [dependencies] lazy_static = "1.4" log = "0.4" -num_enum = "0.4" -parking_lot = "0.10" -reqwest = { version = "0.10", features = [ "gzip", "json" ] } +num_enum = "0.5" +parking_lot = "0.11" +reqwest = { version = "0.11", features = [ "gzip", "json" ] } scan_fmt = { version = "0.2", default-features = false } serde = { version = "1.0", features = [ "derive" ] } serde_repr = "0.1" -strum = "0.17" -strum_macros = "0.17" -tokio = { version = "0.2", default-features = false, features = [ "time" ] } -url = "2.1" +strum = "0.20" +strum_macros = "0.20" +tokio = { version = "1", default-features = false, features = [ "time" ] } +url = "2" [dev-dependencies] -colored = "1.8" -env_logger = "0.7" +colored = "2" +env_logger = "0.8" fake_instant = "0.4" -tokio = "0.2" +tokio = { version = "1", default-features = false, features = [ "rt-multi-thread" ] } diff --git a/src/req/regional_requester.rs b/src/req/regional_requester.rs index ce55dda..54632ba 100644 --- a/src/req/regional_requester.rs +++ b/src/req/regional_requester.rs @@ -3,7 +3,6 @@ use std::sync::Arc; use log; use reqwest::{ Client, StatusCode, Url }; -use tokio::time::delay_for; use crate::Result; use crate::ResponseInfo; @@ -54,7 +53,7 @@ impl RegionalRequester { // Rate limiting. while let Some(delay) = RateLimit::get_both_or_delay(&self.app_rate_limit, &*method_rate_limit) { - delay_for(delay).await; + tokio::time::sleep(delay).await; } // Send request. diff --git a/tests/async_tests.rs b/tests/async_tests.rs index 66e1381..9e60c35 100644 --- a/tests/async_tests.rs +++ b/tests/async_tests.rs @@ -7,7 +7,7 @@ macro_rules! async_tests { env_logger::init(); std::process::exit({ - let mut rt = tokio::runtime::Runtime::new() + let rt = tokio::runtime::Runtime::new() .expect("Failed to create runtime."); let (_, errs) = rt.block_on(async {