refactor: move "rayon" feature under "std"

This commit is contained in:
Itsusinn 2024-06-05 14:05:39 +08:00 committed by Jeremy Soller
parent 1f52b5211c
commit 39c4e3e02b
3 changed files with 10 additions and 13 deletions

View file

@ -36,7 +36,7 @@ default-features = false
features = ["hardcoded-data"]
[features]
default = ["std", "swash", "fontconfig", "rayon"]
default = ["std", "swash", "fontconfig"]
fontconfig = ["fontdb/fontconfig", "std"]
no_std = ["rustybuzz/libm", "hashbrown"]
shape-run-cache = []
@ -47,11 +47,11 @@ std = [
"sys-locale",
"ttf-parser/std",
"unicode-bidi/std",
"rayon"
]
vi = ["modit", "syntect", "cosmic_undo_2"]
wasm-web = ["sys-locale?/js"]
warn_on_missing_glyphs = []
rayon = ["dep:rayon"]
[[bench]]
name = "layout"

View file

@ -160,9 +160,9 @@ impl Font {
}
#[cfg(test)]
mod test{
mod test {
#[test]
fn test_fonts_load_time(){
fn test_fonts_load_time() {
use crate::FontSystem;
use sys_locale::get_locale;
@ -175,9 +175,6 @@ mod test{
FontSystem::new_with_locale_and_db(locale, db);
#[cfg(not(target_arch = "wasm32"))]
println!(
"Fonts load time {}ms.",
now.elapsed().as_millis()
)
println!("Fonts load time {}ms.", now.elapsed().as_millis())
}
}
}

View file

@ -211,15 +211,15 @@ impl FontSystem {
pub fn into_locale_and_db(self) -> (String, fontdb::Database) {
(self.locale, self.db)
}
/// Concurrently cache fonts by id list
pub fn cache_fonts(&mut self, mut ids: Vec<fontdb::ID>) {
#[cfg(feature = "rayon")]
#[cfg(feature = "std")]
use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
ids = ids
.into_iter()
.filter(|id| {
let contains = self.font_cache.contains_key(id);
#[cfg(feature = "std")]
if !contains {
unsafe {
self.db.make_shared_face_data(*id);
@ -229,9 +229,9 @@ impl FontSystem {
})
.collect::<_>();
#[cfg(feature = "rayon")]
#[cfg(feature = "std")]
let fonts = ids.par_iter();
#[cfg(not(feature = "rayon"))]
#[cfg(not(feature = "std"))]
let fonts = ids.iter();
fonts