mirror of
https://github.com/bevyengine/bevy
synced 2025-01-04 17:28:56 +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>
35 lines
1.1 KiB
Rust
35 lines
1.1 KiB
Rust
use alloc::sync::Arc;
|
|
|
|
use bevy_asset::Asset;
|
|
use bevy_reflect::TypePath;
|
|
|
|
/// An [`Asset`] that contains the data for a loaded font, if loaded as an asset.
|
|
///
|
|
/// Loaded by [`FontLoader`](crate::FontLoader).
|
|
///
|
|
/// # A note on fonts
|
|
///
|
|
/// `Font` may differ from the everyday notion of what a "font" is.
|
|
/// A font *face* (e.g. Fira Sans Semibold Italic) is part of a font *family* (e.g. Fira Sans),
|
|
/// and is distinguished from other font faces in the same family
|
|
/// by its style (e.g. italic), its weight (e.g. bold) and its stretch (e.g. condensed).
|
|
///
|
|
/// Bevy currently loads a single font face as a single `Font` asset.
|
|
#[derive(Debug, TypePath, Clone, Asset)]
|
|
pub struct Font {
|
|
/// Content of a font file as bytes
|
|
pub data: Arc<Vec<u8>>,
|
|
}
|
|
|
|
impl Font {
|
|
/// Creates a [`Font`] from bytes
|
|
pub fn try_from_bytes(
|
|
font_data: Vec<u8>,
|
|
) -> Result<Self, cosmic_text::ttf_parser::FaceParsingError> {
|
|
use cosmic_text::ttf_parser;
|
|
ttf_parser::Face::parse(&font_data, 0)?;
|
|
Ok(Self {
|
|
data: Arc::new(font_data),
|
|
})
|
|
}
|
|
}
|