Unasync ShardManager::new (serenity-rs#1940)

nickelc · Jun 11, 2022 · 545f8da · 545f8da
1 parent c980a61
commit 545f8da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/client/bridge/gateway/shard_manager.rs b/src/client/bridge/gateway/shard_manager.rs
@@ -117,7 +117,8 @@ pub struct ShardManager {
 impl ShardManager {
     /// Creates a new shard manager, returning both the manager and a monitor
     /// for usage in a separate thread.
-    pub async fn new(opt: ShardManagerOptions) -> (Arc<Mutex<Self>>, ShardManagerMonitor) {
+    #[must_use]
+    pub fn new(opt: ShardManagerOptions) -> (Arc<Mutex<Self>>, ShardManagerMonitor) {
         let (thread_tx, thread_rx) = mpsc::unbounded();
         let (shard_queue_tx, shard_queue_rx) = mpsc::unbounded();
 

diff --git a/src/client/mod.rs b/src/client/mod.rs
@@ -375,7 +375,7 @@ impl Future for ClientBuilder {
             self.fut = Some(Box::pin(async move {
                 let ws_url = Arc::new(Mutex::new(http.get_gateway().await?.url));
 
-                let (shard_manager, shard_manager_worker) = {
+                let (shard_manager, shard_manager_worker) =
                     ShardManager::new(ShardManagerOptions {
                         data: Arc::clone(&data),
                         event_handler,
@@ -390,9 +390,7 @@ impl Future for ClientBuilder {
                         ws_url: Arc::clone(&ws_url),
                         cache_and_http: Arc::clone(&cache_and_http),
                         intents,
-                    })
-                    .await
-                };
+                    });
 
                 Ok(Client {
                     data,