leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix no_std build

Browse source
This commit is contained in:
John Nunley 2023-07-24 17:57:46 -07:00
parent faa1ceafda
commit 7b289c945b
No known key found for this signature in database
GPG key ID: 42B2FA4582BB1EC9
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/font/system.rs
View file

@ -1,6 +1,7 @@
use crate::{Attrs, AttrsOwned, Font}; use crate::{Attrs, AttrsOwned, Font};
use alloc::string::String; use alloc::string::String;
use alloc::sync::Arc; use alloc::sync::Arc;
use alloc::vec::Vec;
use core::fmt; use core::fmt;
use core::hash::BuildHasherDefault; use core::hash::BuildHasherDefault;
use core::ops::{Deref, DerefMut}; use core::ops::{Deref, DerefMut};
@ -44,7 +45,7 @@ impl FontSystem {
/// while debug builds can take up to ten times longer. For this reason, it should only be /// while debug builds can take up to ten times longer. For this reason, it should only be
/// called once, and the resulting [`FontSystem`] should be shared. /// called once, and the resulting [`FontSystem`] should be shared.
pub fn new() -> Self { pub fn new() -> Self {
Self::new_with_fonts(std::iter::empty()) Self::new_with_fonts(core::iter::empty())
} }
/// Create a new [`FontSystem`] with a pre-specified set of fonts. /// Create a new [`FontSystem`] with a pre-specified set of fonts.
@ -100,6 +101,7 @@ impl FontSystem {
.entry(id) .entry(id)
.or_insert_with(|| { .or_insert_with(|| {
unsafe { unsafe {
#[cfg(feature = "std")]
self.db.make_shared_face_data(id); self.db.make_shared_face_data(id);
} }
let face = self.db.face(id)?; let face = self.db.face(id)?;
@ -119,7 +121,7 @@ impl FontSystem {
//TODO: do not create AttrsOwned unless entry does not already exist //TODO: do not create AttrsOwned unless entry does not already exist
.entry(AttrsOwned::new(attrs)) .entry(AttrsOwned::new(attrs))
.or_insert_with(|| { .or_insert_with(|| {
#[cfg(not(target_arch = "wasm32"))] #[cfg(all(feature = "std", not(target_arch = "wasm32")))]
let now = std::time::Instant::now(); let now = std::time::Instant::now();
let ids = self let ids = self
@ -129,7 +131,7 @@ impl FontSystem {
.map(|face| face.id) .map(|face| face.id)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
#[cfg(not(target_arch = "wasm32"))] #[cfg(all(feature = "std", not(target_arch = "wasm32")))]
{ {
let elapsed = now.elapsed(); let elapsed = now.elapsed();
log::debug!("font matches for {:?} in {:?}", attrs, elapsed); log::debug!("font matches for {:?} in {:?}", attrs, elapsed);