Switched to pollster

code/beginner/tutorial1-window/Cargo.toml

@@ -18,4 +18,4 @@ cgmath = "0.18"
 env_logger = "0.8"
 log = "0.4"
 wgpu = "0.9"
-futures = "0.3"
+pollster = "0.2"

code/beginner/tutorial2-swapchain/Cargo.toml

@@ -13,7 +13,7 @@ cgmath = "0.18"
 env_logger = "0.8"
 log = "0.4"
 wgpu = "0.9"
-futures = "0.3"
+pollster = "0.2"
 
 
 [[bin]]

code/beginner/tutorial2-swapchain/src/challenge.rs

@@ -127,10 +127,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial2-swapchain/src/main.rs

@@ -116,10 +116,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state: State = block_on(State::new(&window));
+    let mut state: State = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial3-pipeline/Cargo.toml

@@ -12,7 +12,7 @@ cgmath = "0.18"
 env_logger = "0.8"
 log = "0.4"
 wgpu = "0.9"
-futures = "0.3"
+pollster = "0.2"
 
 # NEW!
 [build-dependencies]
@@ -26,4 +26,4 @@ path = "src/main.rs"
 
 [[bin]]
 name = "tutorial3-challenge"
-path = "src/challenge.rs"
+path = "src/challenge.rs"

code/beginner/tutorial3-pipeline/src/challenge.rs

@@ -238,10 +238,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial3-pipeline/src/main.rs

@@ -175,10 +175,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial4-buffer/Cargo.toml

@@ -12,7 +12,7 @@ winit = "0.25"
 wgpu = "0.9"
 env_logger = "0.8"
 log = "0.4"
-futures = "0.3"
+pollster = "0.2"
 # NEW!
 bytemuck = { version = "1.4", features = [ "derive" ] }
 
@@ -27,4 +27,4 @@ path = "src/main.rs"
 
 [[bin]]
 name = "tutorial4-challenge"
-path = "src/challenge.rs"
+path = "src/challenge.rs"

code/beginner/tutorial4-buffer/src/challenge.rs

@@ -317,10 +317,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial4-buffer/src/main.rs

@@ -249,10 +249,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial5-textures/Cargo.toml

@@ -12,7 +12,7 @@ bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"
 env_logger = "0.8"
 log = "0.4"
-futures = "0.3"
+pollster = "0.2"
 image = "0.23"
 wgpu = "0.9"
 winit = "0.25"
@@ -29,4 +29,4 @@ path = "src/main.rs"
 
 [[bin]]
 name = "tutorial5-challenge"
-path = "src/challenge.rs"
+path = "src/challenge.rs"

code/beginner/tutorial5-textures/src/challenge.rs

@@ -347,10 +347,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial5-textures/src/main.rs

@@ -302,10 +302,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial6-uniforms/Cargo.toml

@@ -10,7 +10,7 @@ bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"
 env_logger = "0.8"
 log = "0.4"
-futures = "0.3"
+pollster = "0.2"
 image = "0.23"
 wgpu = "0.9"
 winit = "0.25"
@@ -27,4 +27,4 @@ path = "src/main.rs"
 
 [[bin]]
 name = "tutorial6-challenge"
-path = "src/challenge.rs"
+path = "src/challenge.rs"

code/beginner/tutorial6-uniforms/src/challenge.rs

@@ -529,10 +529,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial6-uniforms/src/main.rs

@@ -511,10 +511,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial7-instancing/Cargo.toml

@@ -10,7 +10,7 @@ bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"
 env_logger = "0.8"
 log = "0.4"
-futures = "0.3"
+pollster = "0.2"
 image = "0.23"
 wgpu = "0.9"
 winit = "0.25"
@@ -27,4 +27,4 @@ path = "src/main.rs"
 
 [[bin]]
 name = "tutorial7-challenge"
-path = "src/challenge.rs"
+path = "src/challenge.rs"

code/beginner/tutorial7-instancing/src/challenge.rs

@@ -662,10 +662,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial7-instancing/src/main.rs

@@ -612,10 +612,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial8-depth/Cargo.toml

@@ -9,7 +9,7 @@ anyhow = "1.0"
 bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"
 env_logger = "0.8"
-futures = "0.3"
+pollster = "0.2"
 image = "0.23"
 log = "0.4"
 wgpu = "0.9"

code/beginner/tutorial8-depth/src/challenge.rs

@@ -832,10 +832,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial8-depth/src/main.rs

@@ -638,10 +638,8 @@ fn main() {
     let event_loop = EventLoop::new();
     let window = WindowBuilder::new().build(&event_loop).unwrap();
 
-    use futures::executor::block_on;
-
     // Since main can't be async, we're going to need to block
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
 
     event_loop.run(move |event, _, control_flow| {
         match event {

code/beginner/tutorial9-models/Cargo.toml

@@ -9,7 +9,7 @@ anyhow = "1.0"
 bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"
 env_logger = "0.8"
-futures = "0.3"
+pollster = "0.2"
 image = "0.23"
 log = "0.4"
 tobj = "3.0"
@@ -28,4 +28,4 @@ path = "src/main.rs"
 
 # [[bin]]
 # name = "tutorial9-challenge"
-# path = "src/challenge.rs"
+# path = "src/challenge.rs"

code/beginner/tutorial9-models/src/main.rs

@@ -555,8 +555,9 @@ fn main() {
         .build(&event_loop)
         .unwrap();
 
-    use futures::executor::block_on;
-    let mut state = block_on(State::new(&window));
+    // Since main can't be async, we're going to need to block
+    let mut state = pollster::block_on(State::new(&window));
+
     event_loop.run(move |event, _, control_flow| {
         *control_flow = ControlFlow::Poll;
         match event {

code/intermediate/tutorial10-lighting/Cargo.toml

@@ -9,7 +9,7 @@ anyhow = "1.0"
 bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"
 env_logger = "0.8"
-futures = "0.3"
+pollster = "0.2"
 image = "0.23"
 log = "0.4"
 tobj = "3.0"
@@ -23,4 +23,4 @@ glob = "0.3"
 
 [[bin]]
 name = "tutorial10-lighting"
-path = "src/main.rs"
+path = "src/main.rs"

code/intermediate/tutorial10-lighting/src/main.rs

@@ -689,8 +689,7 @@ fn main() {
         .with_title(title)
         .build(&event_loop)
         .unwrap();
-    use futures::executor::block_on;
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
     event_loop.run(move |event, _, control_flow| {
         *control_flow = ControlFlow::Poll;
         match event {

code/intermediate/tutorial11-normals/Cargo.toml

@@ -9,7 +9,7 @@ anyhow = "1.0"
 bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"
 env_logger = "0.8"
-futures = "0.3"
+pollster = "0.2"
 image = "0.23"
 log = "0.4"
 tobj = "3.0"

code/intermediate/tutorial11-normals/src/main.rs

@@ -742,8 +742,7 @@ fn main() {
         .with_title(title)
         .build(&event_loop)
         .unwrap();
-    use futures::executor::block_on;
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
     event_loop.run(move |event, _, control_flow| {
         *control_flow = ControlFlow::Poll;
         match event {

code/intermediate/tutorial12-camera/Cargo.toml

@@ -9,7 +9,7 @@ anyhow = "1.0"
 bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"
 env_logger = "0.8"
-futures = "0.3"
+pollster = "0.2"
 image = "0.23"
 log = "0.4"
 tobj = "3.0"

code/intermediate/tutorial12-camera/src/main.rs

@@ -649,8 +649,7 @@ fn main() {
         .with_title(title)
         .build(&event_loop)
         .unwrap();
-    use futures::executor::block_on;
-    let mut state = block_on(State::new(&window)); // NEW!
+    let mut state = pollster::block_on(State::new(&window)); // NEW!
     let mut last_render_time = std::time::Instant::now();
     event_loop.run(move |event, _, control_flow| {
         *control_flow = ControlFlow::Poll;

code/intermediate/tutorial13-threading/Cargo.toml

@@ -9,7 +9,7 @@ anyhow = "1.0"
 bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"
 env_logger = "0.8"
-futures = "0.3"
+pollster = "0.2"
 image = "0.23"
 log = "0.4"
 rayon = "1.4" # NEW!

code/intermediate/tutorial13-threading/src/main.rs

@@ -644,8 +644,7 @@ fn main() {
         .with_title(title)
         .build(&event_loop)
         .unwrap();
-    use futures::executor::block_on;
-    let mut state = block_on(State::new(&window)); // NEW!
+    let mut state = pollster::block_on(State::new(&window)); // NEW!
     let mut last_render_time = std::time::Instant::now();
     event_loop.run(move |event, _, control_flow| {
         *control_flow = ControlFlow::Poll;

code/showcase/compute/Cargo.toml

@@ -9,7 +9,7 @@ anyhow = "1.0"
 bytemuck = { version = "1.4", features = ["derive"]}
 cgmath = "0.18"
 env_logger = "0.8"
-futures = "0.3"
+pollster = "0.2"
 image = "0.23"
 log = "0.4"
 rayon = "1.4"

code/showcase/compute/src/main.rs

@@ -585,8 +585,7 @@ fn main() {
         .with_title(title)
         .build(&event_loop)
         .unwrap();
-    use futures::executor::block_on;
-    let mut state = block_on(State::new(&window)); // NEW!
+    let mut state = pollster::block_on(State::new(&window)); // NEW!
     let mut last_render_time = std::time::Instant::now();
     event_loop.run(move |event, _, control_flow| {
         *control_flow = ControlFlow::Poll;

code/showcase/framework/Cargo.toml

@@ -10,7 +10,7 @@ thiserror = "1.0"
 bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"
 env_logger = "0.8"
-futures = "0.3"
+pollster = "0.2"
 image = "0.23"
 log = "0.4"
 tobj = "2.0"

code/showcase/gifs/Cargo.toml

@@ -10,7 +10,7 @@ anyhow = "1.0"
 bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"
 env_logger = "0.8"
-futures = "0.3"
+pollster = "0.2"
 image = "0.23"
 log = "0.4"
 tobj = "2.0"

code/showcase/gifs/src/main.rs

@@ -217,6 +217,5 @@ fn create_render_pipeline(
 }
 
 fn main() {
-    use futures::executor::block_on;
-    block_on(run());
+    pollster::block_on(run());
 }

code/showcase/imgui-demo/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0"
 wgpu = "0.9"
-futures = "0.3"
+pollster = "0.2"
 imgui = "0.7"
 imgui-wgpu = "0.15"
 imgui-winit-support = "0.7"

code/showcase/imgui-demo/src/main.rs

@@ -1,5 +1,4 @@
 use anyhow::*;
-use futures::executor::block_on;
 use imgui::*;
 use imgui_wgpu::{Renderer, RendererConfig};
 use std::time::Duration;
@@ -135,6 +134,6 @@ impl framework::Demo for ImguiDemo {
 }
 
 fn main() -> Result<()> {
-    block_on(framework::run::<ImguiDemo>())?;
+    pollster::block_on(framework::run::<ImguiDemo>())?;
     Ok(())
 }

code/showcase/pong/Cargo.toml

@@ -10,7 +10,7 @@ shaderc = "0.7"
 anyhow = "1.0"
 bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"
-futures = "0.3"
+pollster = "0.2"
 wgpu = "0.9"
 wgpu_glyph = "0.12"
 rand = "0.8"

code/showcase/pong/src/main.rs

@@ -8,7 +8,6 @@ mod util;
 use input::Input;
 use system::System;
 
-use futures::executor::block_on;
 use winit::event::*;
 use winit::event_loop::{ControlFlow, EventLoop};
 use winit::window::{Fullscreen, WindowBuilder};
@@ -25,7 +24,7 @@ fn main() {
         .unwrap();
     window.set_cursor_visible(false);
 
-    let mut render = block_on(render::Render::new(&window, &video_mode));
+    let mut render = pollster::block_on(render::Render::new(&window, &video_mode));
     let mut state = state::State {
         ball: state::Ball {
             position: (0.0, 0.0).into(),

code/showcase/windowless/Cargo.toml

@@ -13,7 +13,7 @@ winit = "0.25"
 shaderc = "0.7"
 cgmath = "0.18"
 wgpu = "0.9"
-futures = "0.3.4"
+pollster = "0.2"
 
 [[bin]]
 name = "windowless"

code/showcase/windowless/src/main.rs

@@ -193,6 +193,5 @@ async fn run() {
 }
 
 fn main() {
-    use futures::executor::block_on;
-    block_on(run());
+    pollster::block_on(run());
 }

docs/beginner/tutorial1-window/README.md

@@ -14,7 +14,7 @@ cgmath = "0.18"
 env_logger = "0.8"
 log = "0.4"
 wgpu = "0.9"
-futures = "0.3"
+pollster = "0.2"
 ```
 
 ## The code

docs/beginner/tutorial2-swapchain/README.md

@@ -129,15 +129,13 @@ At the end of the method, we simply return the resulting struct.
 We'll want to call this in our main method before we enter the event loop.
 
 ```rust
-use futures::executor::block_on;
-
 // Since main can't be async, we're going to need to block
-let mut state = block_on(State::new(&window));
+let mut state = pollster::block_on(State::new(&window));
 ```
 
 <div class="note">
 
-You can use libraries like [async_std](https://docs.rs/async_std) and [tokio](https://docs.rs/tokio) to make main async, so you can await futures. I've elected not to use these crates as this tutorial is not about writing an async application. We just need some way to interact with wgpu's async functions, and the [futures crate](https://docs.rs/futures) is enough for that.
+You can use heavier libraries like [async_std](https://docs.rs/async_std) and [tokio](https://docs.rs/tokio) to make main async, so you can await futures. I've elected not to use these crates as this tutorial is not about writing an async application, and the futures created by wgpu do not require [special executor support](https://rust-lang.github.io/async-book/08_ecosystem/00_chapter.html#determining-ecosystem-compatibility). We just need some way to interact with wgpu's async functions, and the [pollster crate](https://docs.rs/pollster) is enough for that.
 
 </div>
 

docs/beginner/tutorial5-textures/README.md

@@ -428,7 +428,7 @@ cgmath = "0.18"
 winit = "0.25"
 env_logger = "0.8"
 log = "0.4"
-futures = "0.3"
+pollster = "0.2"
 wgpu ="0.6"
 bytemuck = "1.4"
 anyhow = "1.0" // NEW!

docs/intermediate/tutorial12-camera/README.md

@@ -418,12 +418,12 @@ self.light.position =
         * old_position; // UPDATED!
 ```
 
-We still need to calculate `dt`. Let's do that in the `main` function. 
+We still need to calculate `dt`. Let's do that in the `main` function.
 
 ```rust
 fn main() {
     // ...
-    let mut state = block_on(State::new(&window));
+    let mut state = pollster::block_on(State::new(&window));
     let mut last_render_time = std::time::Instant::now();
     event_loop.run(move |event, _, control_flow| {
         *control_flow = ControlFlow::Poll;

docs/showcase/windowless/README.md

@@ -57,7 +57,7 @@ let u32_size = std::mem::size_of::<u32>() as u32;
 let output_buffer_size = (u32_size * texture_size * texture_size) as wgpu::BufferAddress;
 let output_buffer_desc = wgpu::BufferDescriptor {
     size: output_buffer_size,
-    usage: wgpu::BufferUsage::COPY_DST 
+    usage: wgpu::BufferUsage::COPY_DST
         // this tells wpgu that we want to read this buffer from the cpu
         | wgpu::BufferUsage::MAP_READ,
     label: None,
@@ -265,7 +265,7 @@ output_buffer.unmap();
 
 ## Main is not asyncable
 
-The `main()` method can't return a future, so we can't use the `async` keyword. We'll get around this by putting our code into a different function so that we can block on it in `main()`. You'll need to use a crate that can poll futures such as the [futures crate](https://docs.rs/futures).
+The `main()` method can't return a future, so we can't use the `async` keyword. We'll get around this by putting our code into a different function so that we can block on it in `main()`. You'll need to use a crate that can poll futures such as the [pollster crate](https://docs.rs/pollster).
 
 ```rust
 async fn run() {
@@ -273,13 +273,12 @@ async fn run() {
 }
 
 fn main() {
-    use futures::executor::block_on;
-    block_on(run());
+    pollster::block_on(run());
 }
 ```
 
-With all that you should have an image like this. 
+With all that you should have an image like this.
 
 ![a brown triangle](./image-output.png)
 
-<AutoGithubLink/>
+<AutoGithubLink/>