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>
91 lines
2.2 KiB
Rust
91 lines
2.2 KiB
Rust
use core::{
|
|
any,
|
|
fmt::{self, Formatter},
|
|
};
|
|
|
|
use serde::{
|
|
de::{Error, Visitor},
|
|
Deserialize, Deserializer, Serialize, Serializer,
|
|
};
|
|
|
|
use super::{name::Name, FrameCount};
|
|
|
|
impl Serialize for Name {
|
|
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
|
|
serializer.serialize_str(self.as_str())
|
|
}
|
|
}
|
|
|
|
impl<'de> Deserialize<'de> for Name {
|
|
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
|
|
deserializer.deserialize_str(EntityVisitor)
|
|
}
|
|
}
|
|
|
|
struct EntityVisitor;
|
|
|
|
impl<'de> Visitor<'de> for EntityVisitor {
|
|
type Value = Name;
|
|
|
|
fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
|
|
formatter.write_str(any::type_name::<Name>())
|
|
}
|
|
|
|
fn visit_str<E: Error>(self, v: &str) -> Result<Self::Value, E> {
|
|
Ok(Name::new(v.to_string()))
|
|
}
|
|
|
|
fn visit_string<E: Error>(self, v: String) -> Result<Self::Value, E> {
|
|
Ok(Name::new(v))
|
|
}
|
|
}
|
|
|
|
// Manually implementing serialize/deserialize allows us to use a more compact representation as simple integers
|
|
impl Serialize for FrameCount {
|
|
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
|
|
serializer.serialize_u32(self.0)
|
|
}
|
|
}
|
|
|
|
impl<'de> Deserialize<'de> for FrameCount {
|
|
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
|
|
deserializer.deserialize_u32(FrameVisitor)
|
|
}
|
|
}
|
|
|
|
struct FrameVisitor;
|
|
|
|
impl<'de> Visitor<'de> for FrameVisitor {
|
|
type Value = FrameCount;
|
|
|
|
fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
|
|
formatter.write_str(any::type_name::<FrameCount>())
|
|
}
|
|
|
|
fn visit_u32<E>(self, v: u32) -> Result<Self::Value, E>
|
|
where
|
|
E: Error,
|
|
{
|
|
Ok(FrameCount(v))
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
use serde_test::{assert_tokens, Token};
|
|
|
|
#[test]
|
|
fn test_serde_name() {
|
|
let name = Name::new("MyComponent");
|
|
assert_tokens(&name, &[Token::String("MyComponent")]);
|
|
}
|
|
|
|
#[test]
|
|
fn test_serde_frame_count() {
|
|
let frame_count = FrameCount(100);
|
|
assert_tokens(&frame_count, &[Token::U32(100)]);
|
|
}
|
|
}
|