From 6ffdad173d1d200990c285c709fdeaf3a4728273 Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Thu, 3 Jun 2021 14:28:28 -0400
Subject: [PATCH] Switch to using block_on directly from futures-executor
 instead of the umbrella crate

---
 Cargo.lock                     | 2 +-
 voxygen/Cargo.toml             | 2 +-
 voxygen/src/render/renderer.rs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b3842fb7b5..d5e53c4fcf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6030,7 +6030,7 @@ dependencies = [
  "dot_vox",
  "enum-iterator",
  "euc",
- "futures",
+ "futures-executor",
  "gilrs",
  "glyph_brush",
  "guillotiere",
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index c406869a2f..e90f313489 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -85,7 +85,7 @@ crossbeam-channel = "0.5"
 directories-next = "2.0"
 dot_vox = "4.0"
 enum-iterator = "0.6"
-futures = "0.3"
+futures-executor = "0.3"
 guillotiere = "0.6"
 hashbrown = {version = "0.9", features = ["rayon", "serde", "nightly"]}
 image = {version = "0.23.12", default-features = false, features = ["ico", "png"]}
diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index ba36062fd1..2a81c4d2ee 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -176,7 +176,7 @@ impl Renderer {
         #[allow(unsafe_code)]
         let surface = unsafe { instance.create_surface(window) };
 
-        let adapter = futures::executor::block_on(instance.request_adapter(
+        let adapter = futures_executor::block_on(instance.request_adapter(
             &wgpu::RequestAdapterOptionsBase {
                 power_preference: wgpu::PowerPreference::HighPerformance,
                 compatible_surface: Some(&surface),
@@ -189,7 +189,7 @@ impl Renderer {
             ..Default::default()
         };
 
-        let (device, queue) = futures::executor::block_on(
+        let (device, queue) = futures_executor::block_on(
             adapter.request_device(
                 &wgpu::DeviceDescriptor {
                     // TODO