wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-23 21:32:13 +03:00
Code Issues Projects Releases Wiki Activity

gdi.rs: Avoid non-idiomatic iterations over Option, they cause warnings

Browse Source
This commit is contained in:
Pavel Roskin 2023-03-05 09:35:50 -08:00 committed by Wez Furlong
parent 2d05f8f1f2
commit a7cc87f30f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wezterm-font/src/locator/gdi.rs
View File

@ -79,11 +79,10 @@ fn extract_font_data(
parse_and_collect_font_info(&source, &mut font_info, FontOrigin::Gdi)?; parse_and_collect_font_info(&source, &mut font_info, FontOrigin::Gdi)?;
let matches = ParsedFont::best_match(attr, pixel_size, font_info); let matches = ParsedFont::best_match(attr, pixel_size, font_info);
for m in matches { match matches {
return Ok(m); Some(m) => Ok(m),
None => anyhow::bail!("No font matching {:?} in {:?}", attr, source),
} }
anyhow::bail!("No font matching {:?} in {:?}", attr, source);
} }
/// Convert a rust string to a windows wide string /// Convert a rust string to a windows wide string
@ -157,11 +156,10 @@ pub fn parse_log_font(log_font: &LOGFONTW, hdc: HDC) -> anyhow::Result<(ParsedFo
parse_and_collect_font_info(&source, &mut font_info, FontOrigin::Gdi)?; parse_and_collect_font_info(&source, &mut font_info, FontOrigin::Gdi)?;
let matches = ParsedFont::best_match(&attr, pixel_size, font_info); let matches = ParsedFont::best_match(&attr, pixel_size, font_info);
for m in matches { match matches {
return Ok((m, point_size)); Some(m) => Ok((m, point_size)),
None => anyhow::bail!("No font matching {:?} in {:?}", attr, source),
} }
anyhow::bail!("No font matching {:?} in {:?}", attr, source);
} }
} }