Except cfg_if crate dependencies in tutorial10

Cargo.lock

@@ -3031,7 +3031,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bytemuck",
- "cfg-if 1.0.0",
  "cgmath",
  "console_error_panic_hook",
  "console_log",

code/intermediate/tutorial10-lighting/Cargo.toml

@@ -8,7 +8,6 @@ edition = "2018"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-cfg-if = "1"
 anyhow = "1.0"
 bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"

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

@@ -697,13 +697,15 @@ impl State {
 
 #[cfg_attr(target_arch="wasm32", wasm_bindgen(start))]
 pub async fn run() {
-    cfg_if::cfg_if! {
-        if #[cfg(target_arch = "wasm32")] {
-            std::panic::set_hook(Box::new(console_error_panic_hook::hook));
-            console_log::init_with_level(log::Level::Warn).expect("Could't initialize logger");
-        } else {
-            env_logger::init();
-        }
+    #[cfg(target_arch = "wasm32")]
+    {
+        std::panic::set_hook(Box::new(console_error_panic_hook::hook));
+        console_log::init_with_level(log::Level::Warn).expect("Could't initialize logger");
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        env_logger::init();
     }
 
     let event_loop = EventLoop::new();

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

@@ -1,6 +1,5 @@
 use std::io::{BufReader, Cursor};
 
-use cfg_if::cfg_if;
 use wgpu::util::DeviceExt;
 
 use crate::{model, texture};
@@ -17,41 +16,45 @@ use crate::{model, texture};
     base.join(file_name).unwrap()
 }
 
+#[cfg(target_arch = "wasm32")]
 pub async fn load_string(file_name: &str) -> anyhow::Result<String> {
-    cfg_if! {
-        if #[cfg(target_arch = "wasm32")] {
-            let url = format_url(file_name);
-            let txt = reqwest::get(url)
-                .await?
-                .text()
-                .await?;
-        } else {
-            let path = std::path::Path::new(env!("OUT_DIR"))
-                .join("res")
-                .join(file_name);
-            let txt = std::fs::read_to_string(path)?;
-        }
-    }
+    let url = format_url(file_name);
+    let txt = reqwest::get(url)
+        .await?
+        .text()
+        .await?;
+
+    Ok(txt)
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub async fn load_string(file_name: &str) -> anyhow::Result<String> {
+    let path = std::path::Path::new(env!("OUT_DIR"))
+            .join("res")
+            .join(file_name);
+    let txt = std::fs::read_to_string(path)?;
 
     Ok(txt)
 }
 
+#[cfg(target_arch = "wasm32")]
 pub async fn load_binary(file_name: &str) -> anyhow::Result<Vec<u8>> {
-    cfg_if! {
-        if #[cfg(target_arch = "wasm32")] {
-            let url = format_url(file_name);
-            let data = reqwest::get(url)
-                .await?
-                .bytes()
-                .await?
-                .to_vec();
-        } else {
-            let path = std::path::Path::new(env!("OUT_DIR"))
-                .join("res")
-                .join(file_name);
-            let data = std::fs::read(path)?;
-        }
-    }
+    let url = format_url(file_name);
+    let data = reqwest::get(url)
+        .await?
+        .bytes()
+        .await?
+        .to_vec();
+
+    Ok(data)
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub async fn load_binary(file_name: &str) -> anyhow::Result<Vec<u8>> {
+    let path = std::path::Path::new(env!("OUT_DIR"))
+        .join("res")
+        .join(file_name);
+    let data = std::fs::read(path)?;
 
     Ok(data)
 }