Skip to content

Commit db0fa55

Browse files
stephenmartindalealradish
authored andcommitted
Docs: App::run() might never return; effect of WinitSettings::return_from_run. (bevyengine#7228)
# Objective See: - bevyengine#7067 (comment) - (This does not fully close that issue in my opinion.) - https://discord.com/channels/691052431525675048/1063454009769340989 ## Solution This merge request adds documentation: 1. Alert users to the fact that `App::run()` might never return and code placed after it might never be executed. 2. Makes `winit::WinitSettings::return_from_run` discoverable. 3. Better explains why `winit::WinitSettings::return_from_run` is discouraged and better links to up-stream docs. on that topic. 4. Adds notes to the `app/return_after_run.rs` example which otherwise promotes a feature that carries caveats. Furthermore, w.r.t `winit::WinitSettings::return_from_run`: - Broken links to `winit` docs are fixed. - Links now point to BOTH `EventLoop::run()` and `EventLoopExtRunReturn::run_return()` which are the salient up-stream pages and make more sense, taken together. - Collateral damage: "Supported platforms" heading; disambiguation of "run" → `App::run()`; links. ## Future Work I deliberately structured the "`run()` might not return" section under `App::run()` to allow for alternative patterns (e.g. `AppExit` event, `WindowClosed` event) to be listed or mentioned, beneath it, in the future.
1 parent 7baa2cd commit db0fa55

File tree

3 files changed

+50
-8
lines changed

3 files changed

+50
-8
lines changed

crates/bevy_app/src/app.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,24 @@ impl App {
178178
/// Finalizes the [`App`] configuration. For general usage, see the example on the item
179179
/// level documentation.
180180
///
181+
/// # `run()` might not return
182+
///
183+
/// Calls to [`App::run()`] might never return.
184+
///
185+
/// In simple and *headless* applications, one can expect that execution will
186+
/// proceed, normally, after calling [`run()`](App::run()) but this is not the case for
187+
/// windowed applications.
188+
///
189+
/// Windowed apps are typically driven by an *event loop* or *message loop* and
190+
/// some window-manager APIs expect programs to terminate when their primary
191+
/// window is closed and that event loop terminates – behaviour of processes that
192+
/// do not is often platform dependent or undocumented.
193+
///
194+
/// By default, *Bevy* uses the `winit` crate for window creation. See
195+
/// [`WinitSettings::return_from_run`](https://docs.rs/bevy/latest/bevy/winit/struct.WinitSettings.html#structfield.return_from_run)
196+
/// for further discussion of this topic and for a mechanism to require that [`App::run()`]
197+
/// *does* return – albeit one that carries its own caveats and disclaimers.
198+
///
181199
/// # Panics
182200
///
183201
/// Panics if called from `Plugin::build()`, because it would prevent other plugins to properly build.

crates/bevy_winit/src/winit_config.rs

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,28 @@ use bevy_utils::Duration;
44
/// A resource for configuring usage of the `rust_winit` library.
55
#[derive(Debug, Resource)]
66
pub struct WinitSettings {
7-
/// Configures the winit library to return control to the main thread after the
8-
/// [run](bevy_app::App::run) loop is exited. Winit strongly recommends avoiding this when
9-
/// possible. Before using this please read and understand the
10-
/// [caveats](winit::platform::run_return::EventLoopExtRunReturn::run_return) in the winit
11-
/// documentation.
7+
/// Configures `winit` to return control to the caller after exiting the
8+
/// event loop, enabling [`App::run()`](bevy_app::App::run()) to return.
129
///
13-
/// This feature is only available on desktop `target_os` configurations. Namely `windows`,
14-
/// `macos`, `linux`, `dragonfly`, `freebsd`, `netbsd`, and `openbsd`. If set to true on an
15-
/// unsupported platform [run](bevy_app::App::run) will panic.
10+
/// By default, [`return_from_run`](Self::return_from_run) is `false` and *Bevy*
11+
/// will use `winit`'s
12+
/// [`EventLoop::run()`](https://docs.rs/winit/latest/winit/event_loop/struct.EventLoop.html#method.run)
13+
/// to initiate the event loop.
14+
/// [`EventLoop::run()`](https://docs.rs/winit/latest/winit/event_loop/struct.EventLoop.html#method.run)
15+
/// will never return but will terminate the process after the event loop exits.
16+
///
17+
/// Setting [`return_from_run`](Self::return_from_run) to `true` will cause *Bevy*
18+
/// to use `winit`'s
19+
/// [`EventLoopExtRunReturn::run_return()`](https://docs.rs/winit/latest/winit/platform/run_return/trait.EventLoopExtRunReturn.html#tymethod.run_return)
20+
/// instead which is strongly discouraged by the `winit` authors.
21+
///
22+
/// # Supported platforms
23+
///
24+
/// This feature is only available on the following desktop `target_os` configurations:
25+
/// `windows`, `macos`, `linux`, `dragonfly`, `freebsd`, `netbsd`, and `openbsd`.
26+
///
27+
/// Setting [`return_from_run`](Self::return_from_run) to `true` on
28+
/// unsupported platforms will cause [`App::run()`](bevy_app::App::run()) to panic!
1629
pub return_from_run: bool,
1730
/// Configures how the winit event loop updates while the window is focused.
1831
pub focused_mode: UpdateMode,

examples/app/return_after_run.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
//! Shows how to return to the calling function after a windowed Bevy app has exited.
2+
//!
3+
//! In windowed *Bevy* applications, executing code below a call to `App::run()` is
4+
//! not recommended because `App::run()` might never return.
5+
//!
6+
//! This example demonstrates the use of `WinitSettings::return_from_run` to
7+
//! require that `App::run()` *does* return but this is not recommended. Be sure
8+
//! to read the documentation on both `App::run()` and `WinitSettings::return_from_run`
9+
//! for caveats and further details:
10+
//!
11+
//! - <https://docs.rs/bevy/latest/bevy/app/struct.App.html#method.run>
12+
//! - <https://docs.rs/bevy/latest/bevy/winit/struct.WinitSettings.html#structfield.return_from_run>
213
314
use bevy::{prelude::*, winit::WinitSettings};
415

0 commit comments

Comments
 (0)