Migrate Rust Futures 0.2 → 0.3

Relevant Rust RFC: <rust-lang/rfcs#2592>
yvt · Nov 17, 2018 · a28b80f · a28b80f
1 parent 664967a
commit a28b80f
Show file tree

Hide file tree

Showing 13 changed files with 205 additions and 163 deletions.
diff --git a/EngineCore/Cargo.lock b/EngineCore/Cargo.lock
diff --git a/EngineCore/src/ngsgamegfx/Cargo.toml b/EngineCore/src/ngsgamegfx/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 query_interface = "0.3.4"
-futures-preview = "0.2.2"
+futures-preview = "0.3.0-alpha.9"
 pod = "0.5.0"
 arrayvec = "0.4.1"
 rand = "0.5.0"
@@ -16,7 +16,9 @@ parking_lot = "0.6"
 owning_ref = "0.4.0"
 opaque_typedef = "0.0.4"
 opaque_typedef_macros = "0.0.4"
+pin-utils = "0.1.0-alpha.3"
 cryo = { version = "0.1.1", features = ["use_parking_lot"] }
+either = { version = "1.4" }
 zangfx = { path = "../zangfx" }
 ngspf = { path = "../ngspf" }
 ngsenumflags = { path = "../support/ngsenumflags" }

diff --git a/EngineCore/src/ngsgamegfx/src/asyncuploader.rs b/EngineCore/src/ngsgamegfx/src/asyncuploader.rs
@@ -71,6 +71,7 @@ use futures::{
 use std::{
     fmt,
     ops::Range,
+    pin::Unpin,
     sync::{Arc, Mutex},
     thread,
 };
@@ -112,7 +113,7 @@ pub struct AsyncUploader {
 
 type ChannelPayload = Box<dyn FnOnce() -> StreamerRequestStream + Send + 'static>;
 
-type StreamerRequestStream = Box<dyn Stream<Item = StreamerRequest, Error = Never>>;
+type StreamerRequestStream = Box<dyn Stream<Item = StreamerRequest> + Unpin>;
 
 #[derive(Debug)]
 pub enum UploadError {
@@ -153,21 +154,18 @@ impl AsyncUploader {
                             cmd_generator.dst_queue_family = Some(dst_queue_family);
                         }
 
-                        let streamer = streamer::Builder::default(device, queue)
+                        let mut streamer = streamer::Builder::default(device, queue)
                             .with_cmd_generator(cmd_generator)
                             .with_batch_size(1024 * 1024 * 10)
                             .build_with_heap_size(1024 * 1024 * 100)?;
 
-                        let request_stream = receiver
-                            .map(|x: ChannelPayload| x())
-                            .flatten()
-                            .map_err(|_: Never| -> gfx::Error { unreachable!() });
+                        let mut request_stream = receiver.map(|x: ChannelPayload| x()).flatten();
 
-                        let result = streamer.send_all(request_stream);
+                        let result = streamer.send_all(&mut request_stream);
 
                         let mut pool = executor::LocalPool::new();
 
-                        pool.run_until(result, &mut pool.executor())
+                        pool.run_until(result)
                     })() {
                         // Something went wrong in the uploader thread.
                         // Store the error reason before hanging up the receiver.
@@ -231,10 +229,10 @@ impl AsyncUploader {
     pub fn upload<T, R>(
         &self,
         request_source: impl 'static + Send + Sync + FnOnce() -> T,
-    ) -> impl Future<Item = (), Error = UploadError> + Send + Sync + 'static
+    ) -> impl Future<Output = Result<(), UploadError>> + Send + Sync + 'static
     where
-        T: Stream<Item = R, Error = Never> + 'static,
-        R: Request + 'static,
+        T: Stream<Item = R> + Unpin + 'static,
+        R: Request + Unpin + 'static,
     {
         // Use this channel to notify the completion
         let (sender, receiver) = oneshot::channel();

diff --git a/EngineCore/src/ngsgamegfx/src/lib.rs b/EngineCore/src/ngsgamegfx/src/lib.rs
@@ -5,6 +5,9 @@
 //
 //! NgsGameGFX — Nightingales Game GFX
 #![feature(unsized_locals)] // For calling boxed `FnOnce`
+#![feature(futures_api)]
+#![feature(pin)]
+#![feature(arbitrary_self_types)]
 
 mod asyncuploader;
 mod cbtasks;