Merge branch 'zed2' of github.com:zed-industries/zed into zed2

Marshall Bowers committed 3 years ago

Commit b8ae9492 parents 61cc3b9 25e882d1 file · +7 −11Browse files

Unified · Split

 use crate::{AppContext, PlatformDispatcher};
-use futures::{channel::mpsc, pin_mut};
+use futures::{channel::mpsc, pin_mut, FutureExt};
 use smol::prelude::*;
 use std::{
     fmt::Debug,
         duration: Duration,
         future: impl Future<Output = R>,
     ) -> Result<R, impl Future<Output = R>> {
-        let mut future = Box::pin(future);
+        let mut future = Box::pin(future.fuse());
         if duration.is_zero() {
             return Err(future);
         }
-        let timeout = {
+        let mut timer = self.timer(duration).fuse();
-            let future = &mut future;
+        let timeout = async {
-            async {
+            futures::select_biased! {
-                let timer = async {
+                value = future => Ok(value),
-                    self.timer(duration).await;
+                _ = timer => Err(()),
-                    Err(())
-                };
-                let future = async move { Ok(future.await) };
-                timer.race(future).await
             }
         };
         match self.block(timeout) {

Keyboard shortcuts