Merge branch 'mainloop_async_await' into pr_collection

#1059
Spotifyd · Mar 4, 2022 · 3b7ee18 · 3b7ee18
2 parents 91642e6 + 71fdfb9
commit 3b7ee18
Show file tree

Hide file tree

Showing 5 changed files with 226 additions and 286 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,7 +28,7 @@ serde = { version = "1.0.115", features = ["derive"] }
 sha-1 = "0.9"
 structopt = "0.3.17"
 syslog = "4"
-tokio = {version = "1.6.1", features = ["signal", "rt-multi-thread"] }
+tokio = {version = "1.6.1", features = ["signal", "rt-multi-thread", "process", "io-std"] }
 tokio-compat = { version = "0.1.6", features = ["rt-current-thread"] }
 tokio-compat-02 = "0.2.0"
 tokio-stream = "0.1.7"

diff --git a/src/main.rs b/src/main.rs
@@ -106,8 +106,8 @@ fn main() -> Result<(), Report> {
 
     let runtime = Runtime::new().unwrap();
     runtime.block_on(async {
-        let initial_state = setup::initial_state(internal_config);
-        initial_state.await;
+        let mut initial_state = setup::initial_state(internal_config);
+        initial_state.run().await;
     });
 
     Ok(())