
# 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>
211 lines
4.9 KiB
Rust
211 lines
4.9 KiB
Rust
use crate::iter::ParallelIterator;
|
|
|
|
#[derive(Debug)]
|
|
pub struct Chain<T, U> {
|
|
pub(crate) left: T,
|
|
pub(crate) right: U,
|
|
pub(crate) left_in_progress: bool,
|
|
}
|
|
|
|
impl<B, T, U> ParallelIterator<B> for Chain<T, U>
|
|
where
|
|
B: Iterator + Send,
|
|
T: ParallelIterator<B>,
|
|
U: ParallelIterator<B>,
|
|
{
|
|
fn next_batch(&mut self) -> Option<B> {
|
|
if self.left_in_progress {
|
|
match self.left.next_batch() {
|
|
b @ Some(_) => return b,
|
|
None => self.left_in_progress = false,
|
|
}
|
|
}
|
|
self.right.next_batch()
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Map<P, F> {
|
|
pub(crate) iter: P,
|
|
pub(crate) f: F,
|
|
}
|
|
|
|
impl<B, U, T, F> ParallelIterator<core::iter::Map<B, F>> for Map<U, F>
|
|
where
|
|
B: Iterator + Send,
|
|
U: ParallelIterator<B>,
|
|
F: FnMut(B::Item) -> T + Send + Clone,
|
|
{
|
|
fn next_batch(&mut self) -> Option<core::iter::Map<B, F>> {
|
|
self.iter.next_batch().map(|b| b.map(self.f.clone()))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Filter<P, F> {
|
|
pub(crate) iter: P,
|
|
pub(crate) predicate: F,
|
|
}
|
|
|
|
impl<B, P, F> ParallelIterator<core::iter::Filter<B, F>> for Filter<P, F>
|
|
where
|
|
B: Iterator + Send,
|
|
P: ParallelIterator<B>,
|
|
F: FnMut(&B::Item) -> bool + Send + Clone,
|
|
{
|
|
fn next_batch(&mut self) -> Option<core::iter::Filter<B, F>> {
|
|
self.iter
|
|
.next_batch()
|
|
.map(|b| b.filter(self.predicate.clone()))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct FilterMap<P, F> {
|
|
pub(crate) iter: P,
|
|
pub(crate) f: F,
|
|
}
|
|
|
|
impl<B, P, R, F> ParallelIterator<core::iter::FilterMap<B, F>> for FilterMap<P, F>
|
|
where
|
|
B: Iterator + Send,
|
|
P: ParallelIterator<B>,
|
|
F: FnMut(B::Item) -> Option<R> + Send + Clone,
|
|
{
|
|
fn next_batch(&mut self) -> Option<core::iter::FilterMap<B, F>> {
|
|
self.iter.next_batch().map(|b| b.filter_map(self.f.clone()))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct FlatMap<P, F> {
|
|
pub(crate) iter: P,
|
|
pub(crate) f: F,
|
|
}
|
|
|
|
impl<B, P, U, F> ParallelIterator<core::iter::FlatMap<B, U, F>> for FlatMap<P, F>
|
|
where
|
|
B: Iterator + Send,
|
|
P: ParallelIterator<B>,
|
|
F: FnMut(B::Item) -> U + Send + Clone,
|
|
U: IntoIterator,
|
|
U::IntoIter: Send,
|
|
{
|
|
// This extends each batch using the flat map. The other option is
|
|
// to turn each IntoIter into its own batch.
|
|
fn next_batch(&mut self) -> Option<core::iter::FlatMap<B, U, F>> {
|
|
self.iter.next_batch().map(|b| b.flat_map(self.f.clone()))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Flatten<P> {
|
|
pub(crate) iter: P,
|
|
}
|
|
|
|
impl<B, P> ParallelIterator<core::iter::Flatten<B>> for Flatten<P>
|
|
where
|
|
B: Iterator + Send,
|
|
P: ParallelIterator<B>,
|
|
B::Item: IntoIterator,
|
|
<B::Item as IntoIterator>::IntoIter: Send,
|
|
{
|
|
// This extends each batch using the flatten. The other option is to
|
|
// turn each IntoIter into its own batch.
|
|
fn next_batch(&mut self) -> Option<core::iter::Flatten<B>> {
|
|
self.iter.next_batch().map(Iterator::flatten)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Fuse<P> {
|
|
pub(crate) iter: Option<P>,
|
|
}
|
|
|
|
impl<B, P> ParallelIterator<B> for Fuse<P>
|
|
where
|
|
B: Iterator + Send,
|
|
P: ParallelIterator<B>,
|
|
{
|
|
fn next_batch(&mut self) -> Option<B> {
|
|
match &mut self.iter {
|
|
Some(iter) => iter.next_batch().or_else(|| {
|
|
self.iter = None;
|
|
None
|
|
}),
|
|
None => None,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Inspect<P, F> {
|
|
pub(crate) iter: P,
|
|
pub(crate) f: F,
|
|
}
|
|
|
|
impl<B, P, F> ParallelIterator<core::iter::Inspect<B, F>> for Inspect<P, F>
|
|
where
|
|
B: Iterator + Send,
|
|
P: ParallelIterator<B>,
|
|
F: FnMut(&B::Item) + Send + Clone,
|
|
{
|
|
fn next_batch(&mut self) -> Option<core::iter::Inspect<B, F>> {
|
|
self.iter.next_batch().map(|b| b.inspect(self.f.clone()))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Copied<P> {
|
|
pub(crate) iter: P,
|
|
}
|
|
|
|
impl<'a, B, P, T> ParallelIterator<core::iter::Copied<B>> for Copied<P>
|
|
where
|
|
B: Iterator<Item = &'a T> + Send,
|
|
P: ParallelIterator<B>,
|
|
T: 'a + Copy,
|
|
{
|
|
fn next_batch(&mut self) -> Option<core::iter::Copied<B>> {
|
|
self.iter.next_batch().map(Iterator::copied)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Cloned<P> {
|
|
pub(crate) iter: P,
|
|
}
|
|
|
|
impl<'a, B, P, T> ParallelIterator<core::iter::Cloned<B>> for Cloned<P>
|
|
where
|
|
B: Iterator<Item = &'a T> + Send,
|
|
P: ParallelIterator<B>,
|
|
T: 'a + Copy,
|
|
{
|
|
fn next_batch(&mut self) -> Option<core::iter::Cloned<B>> {
|
|
self.iter.next_batch().map(Iterator::cloned)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Cycle<P> {
|
|
pub(crate) iter: P,
|
|
pub(crate) curr: Option<P>,
|
|
}
|
|
|
|
impl<B, P> ParallelIterator<B> for Cycle<P>
|
|
where
|
|
B: Iterator + Send,
|
|
P: ParallelIterator<B> + Clone,
|
|
{
|
|
fn next_batch(&mut self) -> Option<B> {
|
|
self.curr
|
|
.as_mut()
|
|
.and_then(ParallelIterator::next_batch)
|
|
.or_else(|| {
|
|
self.curr = Some(self.iter.clone());
|
|
self.next_batch()
|
|
})
|
|
}
|
|
}
|