Skip to content

Commit 01649f1

Browse files
authored
Refactor App and SubApp internals for better separation (#9202)
# Objective This is a necessary precursor to #9122 (this was split from that PR to reduce the amount of code to review all at once). Moving `!Send` resource ownership to `App` will make it unambiguously `!Send`. `SubApp` must be `Send`, so it can't wrap `App`. ## Solution Refactor `App` and `SubApp` to not have a recursive relationship. Since `SubApp` no longer wraps `App`, once `!Send` resources are moved out of `World` and into `App`, `SubApp` will become unambiguously `Send`. There could be less code duplication between `App` and `SubApp`, but that would break `App` method chaining. ## Changelog - `SubApp` no longer wraps `App`. - `App` fields are no longer publicly accessible. - `App` can no longer be converted into a `SubApp`. - Various methods now return references to a `SubApp` instead of an `App`. ## Migration Guide - To construct a sub-app, use `SubApp::new()`. `App` can no longer convert into `SubApp`. - If you implemented a trait for `App`, you may want to implement it for `SubApp` as well. - If you're accessing `app.world` directly, you now have to use `app.world()` and `app.world_mut()`. - `App::sub_app` now returns `&SubApp`. - `App::sub_app_mut` now returns `&mut SubApp`. - `App::get_sub_app` now returns `Option<&SubApp>.` - `App::get_sub_app_mut` now returns `Option<&mut SubApp>.`
1 parent ec7755d commit 01649f1

File tree

86 files changed

+1364
-943
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1364
-943
lines changed

benches/benches/bevy_ecs/scheduling/schedule.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,19 @@ pub fn empty_schedule_run(criterion: &mut Criterion) {
127127
let mut schedule = Schedule::default();
128128
schedule.set_executor_kind(bevy_ecs::schedule::ExecutorKind::SingleThreaded);
129129
group.bench_function("SingleThreaded", |bencher| {
130-
bencher.iter(|| schedule.run(&mut app.world));
130+
bencher.iter(|| schedule.run(app.world_mut()));
131131
});
132132

133133
let mut schedule = Schedule::default();
134134
schedule.set_executor_kind(bevy_ecs::schedule::ExecutorKind::MultiThreaded);
135135
group.bench_function("MultiThreaded", |bencher| {
136-
bencher.iter(|| schedule.run(&mut app.world));
136+
bencher.iter(|| schedule.run(app.world_mut()));
137137
});
138138

139139
let mut schedule = Schedule::default();
140140
schedule.set_executor_kind(bevy_ecs::schedule::ExecutorKind::Simple);
141141
group.bench_function("Simple", |bencher| {
142-
bencher.iter(|| schedule.run(&mut app.world));
142+
bencher.iter(|| schedule.run(app.world_mut()));
143143
});
144144
group.finish();
145145
}

0 commit comments

Comments
 (0)