mrsbfh

commit 3612d23d2c083a5b2f9683f38446d63fb46e9d8e
parent 2516de8e583b0d65d31cb7a33294d28d067f8e56
Author: MTRNord <mtrnord1@gmail.com>
Date:   Fri,  8 Jan 2021 16:20:24 +0100

fix: Downgrade rust-sdk by one commit and go back to tokio 0.2 due to sqlx

Diffstat:
M
example-bot/Cargo.toml
 | 
4
++--
M
example-bot/src/commands/hello_world.rs
 | 
2
+-
M
mrsbfh-macros/src/lib.rs
 | 
2
+-
M
mrsbfh/Cargo.toml
 | 
4
++--

4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/example-bot/Cargo.toml b/example-bot/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies.matrix-sdk]
 git = "https://github.com/matrix-org/matrix-rust-sdk.git"
-rev = "b311a31c9ef942c357ceb16f07586246655191ce"
+rev = "4f2cad8f626068f05d567588d8398d0952536a46"
 
 [dependencies]
 mrsbfh = {path = "../mrsbfh"}
@@ -16,7 +16,7 @@ serde = "1.0"
 tracing = "0.1"
 tracing-subscriber = "0.2"
 tracing-futures = "0.2.4"
-tokio = { version = "1.0.1", features = ["full"] }
+tokio = { version = "0.2", features = ["full"] }
 clap = "3.0.0-beta.2"
 async-trait = "0.1.41"
 thiserror = "1.0"
 \ No newline at end of file
diff --git a/example-bot/src/commands/hello_world.rs b/example-bot/src/commands/hello_world.rs
@@ -5,7 +5,7 @@ use mrsbfh::commands::command;
 
 #[command(help = "`!hello_world` - Prints \"hello world\".")]
 pub async fn hello_world<'a>(
-    tx: mrsbfh::Sender,
+    mut tx: mrsbfh::Sender,
     _config: Config<'a>,
     _sender: String,
     mut _args: Vec<&str>,
diff --git a/mrsbfh-macros/src/lib.rs b/mrsbfh-macros/src/lib.rs
@@ -254,7 +254,7 @@ pub fn autojoin(_: TokenStream, input: TokenStream) -> TokenStream {
                                         room_id, err, delay
                                     );
 
-                                    tokio::time::sleep(tokio::time::Duration::from_secs(delay)).await;
+                                    tokio::time::delay_for(tokio::time::Duration::from_secs(delay)).await;
                                     delay *= 2;
 
                                     if delay > 3600 {
diff --git a/mrsbfh/Cargo.toml b/mrsbfh/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies.matrix-sdk]
 git = "https://github.com/matrix-org/matrix-rust-sdk.git"
-rev = "b311a31c9ef942c357ceb16f07586246655191ce"
+rev = "4f2cad8f626068f05d567588d8398d0952536a46"
 
 [dependencies]
 url = "2.1.1"
@@ -19,7 +19,7 @@ thiserror = "1.0"
 mrsbfh-macros = {path = "../mrsbfh-macros"}
 const-concat = {git = "https://github.com/Vurich/const-concat", rev = "f836e77a4ecadf6a11994340fdcbbdadcdc4906d"}
 
-tokio = { version = "1.0.1", features = ["full"] }
+tokio = { version = "0.2", features = ["full"] }
 tracing = "0.1"
 
 serde = "1.0"