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>
68 lines
1.6 KiB
Rust
68 lines
1.6 KiB
Rust
use bevy_ecs::prelude::*;
|
|
use glam::*;
|
|
|
|
#[derive(Component, Copy, Clone)]
|
|
struct Transform(Mat4);
|
|
|
|
#[derive(Component, Copy, Clone)]
|
|
struct Position<const X: usize>(Vec3);
|
|
|
|
#[derive(Component, Copy, Clone)]
|
|
struct Rotation(Vec3);
|
|
|
|
#[derive(Component, Copy, Clone)]
|
|
struct Velocity<const X: usize>(Vec3);
|
|
|
|
pub struct Benchmark<'w>(
|
|
World,
|
|
QueryState<(
|
|
&'w Velocity<0>,
|
|
&'w mut Position<0>,
|
|
&'w Velocity<1>,
|
|
&'w mut Position<1>,
|
|
&'w Velocity<2>,
|
|
&'w mut Position<2>,
|
|
&'w Velocity<3>,
|
|
&'w mut Position<3>,
|
|
&'w Velocity<4>,
|
|
&'w mut Position<4>,
|
|
)>,
|
|
);
|
|
|
|
impl<'w> Benchmark<'w> {
|
|
pub fn new() -> Self {
|
|
let mut world = World::new();
|
|
|
|
world.spawn_batch(
|
|
core::iter::repeat((
|
|
Transform(Mat4::from_scale(Vec3::ONE)),
|
|
Rotation(Vec3::X),
|
|
Position::<0>(Vec3::X),
|
|
Velocity::<0>(Vec3::X),
|
|
Position::<1>(Vec3::X),
|
|
Velocity::<1>(Vec3::X),
|
|
Position::<2>(Vec3::X),
|
|
Velocity::<2>(Vec3::X),
|
|
Position::<3>(Vec3::X),
|
|
Velocity::<3>(Vec3::X),
|
|
Position::<4>(Vec3::X),
|
|
Velocity::<4>(Vec3::X),
|
|
))
|
|
.take(10_000),
|
|
);
|
|
|
|
let query = world.query();
|
|
Self(world, query)
|
|
}
|
|
|
|
#[inline(never)]
|
|
pub fn run(&mut self) {
|
|
for mut item in self.1.iter_mut(&mut self.0) {
|
|
item.1 .0 += item.0 .0;
|
|
item.3 .0 += item.2 .0;
|
|
item.5 .0 += item.4 .0;
|
|
item.7 .0 += item.6 .0;
|
|
}
|
|
}
|
|
}
|