Replace cfg_if! with cfg_select! (#23896)

# Objective

Implements: #23828

I've also increased the MSRV of the top level bevy crate to `1.95.0`

Author: mpowell90

Cargo.toml

@@ -10,7 +10,7 @@ keywords = ["game", "engine", "gamedev", "graphics", "bevy"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/bevyengine/bevy"
 documentation = "https://docs.rs/bevy"
-rust-version = "1.92.0"
+rust-version = "1.95.0"
 
 [workspace]
 resolver = "3"

crates/bevy_app/Cargo.toml

@@ -94,7 +94,6 @@ thiserror = { version = "2", default-features = false }
 variadics_please = "1.1"
 tracing = { version = "0.1", default-features = false, optional = true }
 log = { version = "0.4", default-features = false }
-cfg-if = "1.0.0"
 dioxus-devtools = { version = "0.7.0-alpha.1", optional = true }
 crossbeam-channel = { version = "0.5.0", optional = true }
 

crates/bevy_app/src/panic_handler.rs

@@ -43,11 +43,12 @@ impl Plugin for PanicHandlerPlugin {
         {
             static SET_HOOK: std::sync::Once = std::sync::Once::new();
             SET_HOOK.call_once(|| {
-                cfg_if::cfg_if! {
-                    if #[cfg(all(target_arch = "wasm32", feature = "web"))] {
+                cfg_select! {
+                    all(target_arch = "wasm32", feature = "web") => {
                         // This provides better panic handling in JS engines (displays the panic message and improves the backtrace).
                         std::panic::set_hook(alloc::boxed::Box::new(console_error_panic_hook::hook));
-                    } else if #[cfg(feature = "error_panic_hook")] {
+                    }
+                    feature = "error_panic_hook" => {
                         let current_hook = std::panic::take_hook();
                         std::panic::set_hook(alloc::boxed::Box::new(
                             bevy_ecs::error::bevy_error_panic_hook(current_hook),

crates/bevy_app/src/schedule_runner.rs

@@ -118,8 +118,8 @@ impl Plugin for ScheduleRunnerPlugin {
                         Ok(None)
                     };
 
-                    cfg_if::cfg_if! {
-                        if #[cfg(all(target_arch = "wasm32", feature = "web"))] {
+                    cfg_select! {
+                        all(target_arch = "wasm32", feature = "web") => {
                             fn set_timeout(callback: &Closure<dyn FnMut()>, dur: Duration) {
                                 web_sys::window()
                                     .unwrap()
@@ -156,7 +156,8 @@ impl Plugin for ScheduleRunnerPlugin {
                             set_timeout(base_tick_closure.borrow().as_ref().unwrap(), asap);
 
                             exit.take()
-                        } else {
+                        }
+                        _ =>{
                             loop {
                                 match tick(&mut app, wait) {
                                     Ok(Some(delay)) => {

crates/bevy_app/src/task_pool_plugin.rs

@@ -6,8 +6,8 @@ use bevy_tasks::{AsyncComputeTaskPool, ComputeTaskPool, IoTaskPool, TaskPoolBuil
 use core::fmt::Debug;
 use log::trace;
 
-cfg_if::cfg_if! {
-    if #[cfg(not(all(target_arch = "wasm32", feature = "web")))] {
+cfg_select! {
+    not(all(target_arch = "wasm32", feature = "web")) => {
         use {crate::Last, bevy_tasks::tick_global_task_pools_on_main_thread};
         use bevy_ecs::system::NonSendMarker;
 
@@ -19,6 +19,7 @@ cfg_if::cfg_if! {
             tick_global_task_pools_on_main_thread();
         }
     }
+    _ => {}
 }
 
 /// Setup of default task pools: [`AsyncComputeTaskPool`], [`ComputeTaskPool`], [`IoTaskPool`].

crates/bevy_winit/Cargo.toml

@@ -68,7 +68,6 @@ accesskit_winit = { version = "0.32", default-features = false, features = [
   "rwh_06",
 ] }
 approx = { version = "0.5", default-features = false }
-cfg-if = "1.0"
 accesskit = "0.24"
 tracing = { version = "0.1", default-features = false, features = ["std"] }
 

crates/bevy_winit/src/state.rs

@@ -682,13 +682,13 @@ impl WinitAppRunnerState {
                 // per winit's docs on [Window::is_visible](https://docs.rs/winit/latest/winit/window/struct.Window.html#method.is_visible),
                 // we cannot use the visibility to drive rendering on these platforms
                 // so we cannot discern whether to beneficially use `Poll` or not?
-                cfg_if::cfg_if! {
-                    if #[cfg(not(any(
+                cfg_select! {
+                    not(any(
                         target_arch = "wasm32",
                         target_os = "android",
                         target_os = "ios",
                         all(target_os = "linux", any(feature = "x11", feature = "wayland"))
-                    )))]
+                    )) =>
                     {
                         let visible = WINIT_WINDOWS.with_borrow(|winit_windows| {
                             winit_windows.windows.iter().any(|(_, w)| {
@@ -702,7 +702,7 @@ impl WinitAppRunnerState {
                             ControlFlow::Poll
                         });
                     }
-                    else {
+                    _ => {
                         event_loop.set_control_flow(ControlFlow::Wait);
                     }
                 }
@@ -903,11 +903,12 @@ pub fn winit_runner(mut app: App, event_loop: EventLoop<WinitUserEvent>) -> AppE
     trace!("starting winit event loop");
     // The winit docs mention using `spawn` instead of `run` on Wasm.
     // https://docs.rs/winit/latest/winit/platform/web/trait.EventLoopExtWebSys.html#tymethod.spawn_app
-    cfg_if::cfg_if! {
-        if #[cfg(target_arch = "wasm32")] {
+    cfg_select! {
+        target_arch = "wasm32" => {
             event_loop.spawn_app(runner_state);
             AppExit::Success
-        } else {
+        }
+        _ => {
             let mut runner_state = runner_state;
             if let Err(err) = event_loop.run_app(&mut runner_state) {
                 bevy_log::error!("winit event loop returned an error: {err}");