formatting and clippy fixes

macos-click-through
Keith Simmons 3 years ago
parent b0222d206e
commit 73902a6c7a

@ -53,13 +53,15 @@ impl CachingShaper {
bold: options.bold, bold: options.bold,
font_selection: options.fallback_list.first().unwrap().clone().into(), font_selection: options.fallback_list.first().unwrap().clone().into(),
}) })
.unwrap_or(default_key.clone()); .unwrap_or_else(|| default_key.clone());
if let Some(font_pair) = self.font_loader.get_or_load(&font_key) { if let Some(font_pair) = self.font_loader.get_or_load(&font_key) {
return font_pair; return font_pair;
} }
self.font_loader.get_or_load(&default_key).expect("Could not load font") self.font_loader
.get_or_load(&default_key)
.expect("Could not load font")
} }
pub fn current_size(&self) -> f32 { pub fn current_size(&self) -> f32 {
@ -112,7 +114,12 @@ impl CachingShaper {
(metrics.ascent + metrics.leading) as u64 (metrics.ascent + metrics.leading) as u64
} }
fn build_clusters(&mut self, text: &str, bold: bool, italic: bool) -> Vec<(Vec<CharCluster>, Arc<FontPair>)> { fn build_clusters(
&mut self,
text: &str,
bold: bool,
italic: bool,
) -> Vec<(Vec<CharCluster>, Arc<FontPair>)> {
let mut cluster = CharCluster::new(); let mut cluster = CharCluster::new();
// Enumerate the characters storing the glyph index in the user data so that we can position // Enumerate the characters storing the glyph index in the user data so that we can position

@ -20,7 +20,6 @@ use glutin::{
ContextBuilder, GlProfile, WindowedContext, ContextBuilder, GlProfile, WindowedContext,
}; };
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
use glutin::platform::unix::WindowBuilderExtUnix; use glutin::platform::unix::WindowBuilderExtUnix;

Loading…
Cancel
Save