# 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>
120 lines
4.0 KiB
Rust
120 lines
4.0 KiB
Rust
use bevy_ecs::prelude::*;
|
|
use criterion::Criterion;
|
|
|
|
/// A run `Condition` that always returns true
|
|
fn yes() -> bool {
|
|
true
|
|
}
|
|
|
|
/// A run `Condition` that always returns false
|
|
fn no() -> bool {
|
|
false
|
|
}
|
|
|
|
pub fn run_condition_yes(criterion: &mut Criterion) {
|
|
let mut world = World::new();
|
|
let mut group = criterion.benchmark_group("run_condition/yes");
|
|
group.warm_up_time(core::time::Duration::from_millis(500));
|
|
group.measurement_time(core::time::Duration::from_secs(3));
|
|
fn empty() {}
|
|
for amount in 0..21 {
|
|
let mut schedule = Schedule::default();
|
|
schedule.add_systems(empty.run_if(yes));
|
|
for _ in 0..amount {
|
|
schedule.add_systems((empty, empty, empty, empty, empty).distributive_run_if(yes));
|
|
}
|
|
// run once to initialize systems
|
|
schedule.run(&mut world);
|
|
group.bench_function(&format!("{:03}_systems", 5 * amount + 1), |bencher| {
|
|
bencher.iter(|| {
|
|
schedule.run(&mut world);
|
|
});
|
|
});
|
|
}
|
|
group.finish();
|
|
}
|
|
|
|
pub fn run_condition_no(criterion: &mut Criterion) {
|
|
let mut world = World::new();
|
|
let mut group = criterion.benchmark_group("run_condition/no");
|
|
group.warm_up_time(core::time::Duration::from_millis(500));
|
|
group.measurement_time(core::time::Duration::from_secs(3));
|
|
fn empty() {}
|
|
for amount in 0..21 {
|
|
let mut schedule = Schedule::default();
|
|
schedule.add_systems(empty.run_if(no));
|
|
for _ in 0..amount {
|
|
schedule.add_systems((empty, empty, empty, empty, empty).distributive_run_if(no));
|
|
}
|
|
// run once to initialize systems
|
|
schedule.run(&mut world);
|
|
group.bench_function(&format!("{:03}_systems", 5 * amount + 1), |bencher| {
|
|
bencher.iter(|| {
|
|
schedule.run(&mut world);
|
|
});
|
|
});
|
|
}
|
|
group.finish();
|
|
}
|
|
|
|
#[derive(Component, Resource)]
|
|
struct TestBool(pub bool);
|
|
|
|
pub fn run_condition_yes_with_query(criterion: &mut Criterion) {
|
|
let mut world = World::new();
|
|
world.spawn(TestBool(true));
|
|
let mut group = criterion.benchmark_group("run_condition/yes_using_query");
|
|
group.warm_up_time(core::time::Duration::from_millis(500));
|
|
group.measurement_time(core::time::Duration::from_secs(3));
|
|
fn empty() {}
|
|
fn yes_with_query(query: Query<&TestBool>) -> bool {
|
|
query.single().0
|
|
}
|
|
for amount in 0..21 {
|
|
let mut schedule = Schedule::default();
|
|
schedule.add_systems(empty.run_if(yes_with_query));
|
|
for _ in 0..amount {
|
|
schedule.add_systems(
|
|
(empty, empty, empty, empty, empty).distributive_run_if(yes_with_query),
|
|
);
|
|
}
|
|
// run once to initialize systems
|
|
schedule.run(&mut world);
|
|
group.bench_function(&format!("{:03}_systems", 5 * amount + 1), |bencher| {
|
|
bencher.iter(|| {
|
|
schedule.run(&mut world);
|
|
});
|
|
});
|
|
}
|
|
group.finish();
|
|
}
|
|
|
|
pub fn run_condition_yes_with_resource(criterion: &mut Criterion) {
|
|
let mut world = World::new();
|
|
world.insert_resource(TestBool(true));
|
|
let mut group = criterion.benchmark_group("run_condition/yes_using_resource");
|
|
group.warm_up_time(core::time::Duration::from_millis(500));
|
|
group.measurement_time(core::time::Duration::from_secs(3));
|
|
fn empty() {}
|
|
fn yes_with_resource(res: Res<TestBool>) -> bool {
|
|
res.0
|
|
}
|
|
for amount in 0..21 {
|
|
let mut schedule = Schedule::default();
|
|
schedule.add_systems(empty.run_if(yes_with_resource));
|
|
for _ in 0..amount {
|
|
schedule.add_systems(
|
|
(empty, empty, empty, empty, empty).distributive_run_if(yes_with_resource),
|
|
);
|
|
}
|
|
// run once to initialize systems
|
|
schedule.run(&mut world);
|
|
group.bench_function(&format!("{:03}_systems", 5 * amount + 1), |bencher| {
|
|
bencher.iter(|| {
|
|
schedule.run(&mut world);
|
|
});
|
|
});
|
|
}
|
|
group.finish();
|
|
}
|