d70595b667
# Objective - Fixes #6370 - Closes #6581 ## Solution - Added the following lints to the workspace: - `std_instead_of_core` - `std_instead_of_alloc` - `alloc_instead_of_core` - Used `cargo +nightly fmt` with [item level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Item%5C%3A) to split all `use` statements into single items. - Used `cargo clippy --workspace --all-targets --all-features --fix --allow-dirty` to _attempt_ to resolve the new linting issues, and intervened where the lint was unable to resolve the issue automatically (usually due to needing an `extern crate alloc;` statement in a crate root). - Manually removed certain uses of `std` where negative feature gating prevented `--all-features` from finding the offending uses. - Used `cargo +nightly fmt` with [crate level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Crate%5C%3A) to re-merge all `use` statements matching Bevy's previous styling. - Manually fixed cases where the `fmt` tool could not re-merge `use` statements due to conditional compilation attributes. ## Testing - Ran CI locally ## Migration Guide The MSRV is now 1.81. Please update to this version or higher. ## Notes - This is a _massive_ change to try and push through, which is why I've outlined the semi-automatic steps I used to create this PR, in case this fails and someone else tries again in the future. - Making this change has no impact on user code, but does mean Bevy contributors will be warned to use `core` and `alloc` instead of `std` where possible. - This lint is a critical first step towards investigating `no_std` options for Bevy. --------- Co-authored-by: François Mockers <francois.mockers@vleue.com>
74 lines
2.5 KiB
Rust
74 lines
2.5 KiB
Rust
use core::sync::atomic::{AtomicBool, Ordering};
|
|
|
|
use bevy_ecs::event::EventWriter;
|
|
|
|
use crate::{App, AppExit, Plugin, Update};
|
|
|
|
pub use ctrlc;
|
|
|
|
/// Indicates that all [`App`]'s should exit.
|
|
static SHOULD_EXIT: AtomicBool = AtomicBool::new(false);
|
|
|
|
/// Gracefully handles `Ctrl+C` by emitting a [`AppExit`] event. This plugin is part of the `DefaultPlugins`.
|
|
///
|
|
/// ```no_run
|
|
/// # use bevy_app::{App, NoopPluginGroup as MinimalPlugins, PluginGroup, TerminalCtrlCHandlerPlugin};
|
|
/// fn main() {
|
|
/// App::new()
|
|
/// .add_plugins(MinimalPlugins)
|
|
/// .add_plugins(TerminalCtrlCHandlerPlugin)
|
|
/// .run();
|
|
/// }
|
|
/// ```
|
|
///
|
|
/// If you want to setup your own `Ctrl+C` handler, you should call the
|
|
/// [`TerminalCtrlCHandlerPlugin::gracefully_exit`] function in your handler if you want bevy to gracefully exit.
|
|
/// ```no_run
|
|
/// # use bevy_app::{App, NoopPluginGroup as DefaultPlugins, PluginGroup, TerminalCtrlCHandlerPlugin, ctrlc};
|
|
/// fn main() {
|
|
/// // Your own `Ctrl+C` handler
|
|
/// ctrlc::set_handler(move || {
|
|
/// // Other clean up code ...
|
|
///
|
|
/// TerminalCtrlCHandlerPlugin::gracefully_exit();
|
|
/// });
|
|
///
|
|
/// App::new()
|
|
/// .add_plugins(DefaultPlugins)
|
|
/// .run();
|
|
/// }
|
|
/// ```
|
|
#[derive(Default)]
|
|
pub struct TerminalCtrlCHandlerPlugin;
|
|
|
|
impl TerminalCtrlCHandlerPlugin {
|
|
/// Sends the [`AppExit`] event to all apps using this plugin to make them gracefully exit.
|
|
pub fn gracefully_exit() {
|
|
SHOULD_EXIT.store(true, Ordering::Relaxed);
|
|
}
|
|
|
|
/// Sends a [`AppExit`] event when the user presses `Ctrl+C` on the terminal.
|
|
pub fn exit_on_flag(mut events: EventWriter<AppExit>) {
|
|
if SHOULD_EXIT.load(Ordering::Relaxed) {
|
|
events.send(AppExit::from_code(130));
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Plugin for TerminalCtrlCHandlerPlugin {
|
|
fn build(&self, app: &mut App) {
|
|
let result = ctrlc::try_set_handler(move || {
|
|
Self::gracefully_exit();
|
|
});
|
|
match result {
|
|
Ok(()) => {}
|
|
Err(ctrlc::Error::MultipleHandlers) => {
|
|
bevy_utils::tracing::info!("Skipping installing `Ctrl+C` handler as one was already installed. Please call `TerminalCtrlCHandlerPlugin::gracefully_exit` in your own `Ctrl+C` handler if you want Bevy to gracefully exit on `Ctrl+C`.");
|
|
}
|
|
Err(err) => bevy_utils::tracing::warn!("Failed to set `Ctrl+C` handler: {err}"),
|
|
}
|
|
|
|
app.add_systems(Update, TerminalCtrlCHandlerPlugin::exit_on_flag);
|
|
}
|
|
}
|