Revert "Use futures instead of tokio (for just one call, sounds more appropriate)"

This reverts commit 9809327784
This commit is contained in:
VC
2020-07-27 21:02:10 +02:00
parent 9809327784
commit 1f98954d2e
3 changed files with 8 additions and 7 deletions

4
Cargo.lock generated
View File

@@ -1623,15 +1623,15 @@ dependencies = [
[[package]] [[package]]
name = "scootaloo" name = "scootaloo"
version = "0.2.1" version = "0.2.0"
dependencies = [ dependencies = [
"clap", "clap",
"egg-mode", "egg-mode",
"elefren", "elefren",
"futures 0.3.5",
"htmlescape", "htmlescape",
"reqwest", "reqwest",
"serde", "serde",
"tokio 0.2.13",
"toml", "toml",
] ]

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "scootaloo" name = "scootaloo"
version = "0.2.1" version = "0.2.0"
authors = ["VC <veretcle+framagit@mateu.be>"] authors = ["VC <veretcle+framagit@mateu.be>"]
edition = "2018" edition = "2018"
@@ -11,7 +11,7 @@ serde = { version = "1.0", features = ["derive"] }
toml = "^0.5" toml = "^0.5"
clap = "^2.33" clap = "^2.33"
futures = "^0.3" tokio = "^0.2"
egg-mode = "^0.14" egg-mode = "^0.14"
elefren = "^0.20" elefren = "^0.20"

View File

@@ -9,8 +9,8 @@ use std::{
error::Error, error::Error,
}; };
// futures //tokio
use futures::executor::block_on; use tokio::runtime::Runtime;
// toml // toml
use serde::Deserialize; use serde::Deserialize;
@@ -77,7 +77,8 @@ fn get_oauth2_token(config: &Config) -> Token {
/// Get twitter user timeline /// Get twitter user timeline
fn get_user_timeline(config: &Config, token: Token, lid: Option<u64>) -> Result<Vec<Tweet>, Box<dyn Error>> { fn get_user_timeline(config: &Config, token: Token, lid: Option<u64>) -> Result<Vec<Tweet>, Box<dyn Error>> {
// fix the page size to 200 as it is the maximum Twitter authorizes // fix the page size to 200 as it is the maximum Twitter authorizes
let (_timeline, feed) = block_on(user_timeline(UserID::from(String::from(&config.twitter.username)), true, false, &token) let mut rt = Runtime::new()?;
let (_timeline, feed) = rt.block_on(user_timeline(UserID::from(String::from(&config.twitter.username)), true, false, &token)
.with_page_size(200) .with_page_size(200)
.older(lid))?; .older(lid))?;