mirror of
https://github.com/bevyengine/bevy
synced 2024-12-20 18:13:10 +00:00
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>
113 lines
3.8 KiB
Rust
113 lines
3.8 KiB
Rust
use proc_macro::{Span, TokenStream};
|
|
use quote::quote;
|
|
use syn::{parse_macro_input, Data, DeriveInput, Field, Index, Member, Type};
|
|
|
|
const DEREF: &str = "Deref";
|
|
const DEREF_MUT: &str = "DerefMut";
|
|
const DEREF_ATTR: &str = "deref";
|
|
|
|
pub fn derive_deref(input: TokenStream) -> TokenStream {
|
|
let ast = parse_macro_input!(input as DeriveInput);
|
|
|
|
let ident = &ast.ident;
|
|
let (field_member, field_type) = match get_deref_field(&ast, false) {
|
|
Ok(items) => items,
|
|
Err(err) => {
|
|
return err.into_compile_error().into();
|
|
}
|
|
};
|
|
let (impl_generics, ty_generics, where_clause) = ast.generics.split_for_impl();
|
|
|
|
TokenStream::from(quote! {
|
|
impl #impl_generics ::core::ops::Deref for #ident #ty_generics #where_clause {
|
|
type Target = #field_type;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.#field_member
|
|
}
|
|
}
|
|
})
|
|
}
|
|
|
|
pub fn derive_deref_mut(input: TokenStream) -> TokenStream {
|
|
let ast = parse_macro_input!(input as DeriveInput);
|
|
|
|
let ident = &ast.ident;
|
|
let (field_member, _) = match get_deref_field(&ast, true) {
|
|
Ok(items) => items,
|
|
Err(err) => {
|
|
return err.into_compile_error().into();
|
|
}
|
|
};
|
|
let (impl_generics, ty_generics, where_clause) = ast.generics.split_for_impl();
|
|
|
|
TokenStream::from(quote! {
|
|
impl #impl_generics ::core::ops::DerefMut for #ident #ty_generics #where_clause {
|
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
|
&mut self.#field_member
|
|
}
|
|
}
|
|
})
|
|
}
|
|
|
|
fn get_deref_field(ast: &DeriveInput, is_mut: bool) -> syn::Result<(Member, &Type)> {
|
|
let deref_kind = if is_mut { DEREF_MUT } else { DEREF };
|
|
let deref_attr_str = format!("`#[{DEREF_ATTR}]`");
|
|
|
|
match &ast.data {
|
|
Data::Struct(data_struct) if data_struct.fields.is_empty() => Err(syn::Error::new(
|
|
Span::call_site().into(),
|
|
format!("{deref_kind} cannot be derived on field-less structs"),
|
|
)),
|
|
Data::Struct(data_struct) if data_struct.fields.len() == 1 => {
|
|
let field = data_struct.fields.iter().next().unwrap();
|
|
let member = to_member(field, 0);
|
|
Ok((member, &field.ty))
|
|
}
|
|
Data::Struct(data_struct) => {
|
|
let mut selected_field: Option<(Member, &Type)> = None;
|
|
for (index, field) in data_struct.fields.iter().enumerate() {
|
|
for attr in &field.attrs {
|
|
if !attr.meta.path().is_ident(DEREF_ATTR) {
|
|
continue;
|
|
}
|
|
|
|
attr.meta.require_path_only()?;
|
|
|
|
if selected_field.is_some() {
|
|
return Err(syn::Error::new_spanned(
|
|
attr,
|
|
format!(
|
|
"{deref_attr_str} attribute can only be used on a single field"
|
|
),
|
|
));
|
|
}
|
|
|
|
let member = to_member(field, index);
|
|
selected_field = Some((member, &field.ty));
|
|
}
|
|
}
|
|
|
|
if let Some(selected_field) = selected_field {
|
|
Ok(selected_field)
|
|
} else {
|
|
Err(syn::Error::new(
|
|
Span::call_site().into(),
|
|
format!("deriving {deref_kind} on multi-field structs requires one field to have the {deref_attr_str} attribute"),
|
|
))
|
|
}
|
|
}
|
|
_ => Err(syn::Error::new(
|
|
Span::call_site().into(),
|
|
format!("{deref_kind} can only be derived on structs"),
|
|
)),
|
|
}
|
|
}
|
|
|
|
fn to_member(field: &Field, index: usize) -> Member {
|
|
field
|
|
.ident
|
|
.as_ref()
|
|
.map(|name| Member::Named(name.clone()))
|
|
.unwrap_or_else(|| Member::Unnamed(Index::from(index)))
|
|
}
|