Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

gfx: Use ? on Option more often.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-12-09 20:27:16 +01:00
parent 6c37edf602
commit eb00aa4164
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/gfx/platform/macos/font.rs
View file

@ -69,11 +69,7 @@ impl FontHandle {
/// Cache all the data needed for basic horizontal kerning. This is used only as a fallback or
/// fast path (when the GPOS table is missing or unnecessary) so it needn't handle every case.
fn find_h_kern_subtable(&self) -> Option<CachedKernTable> {
let font_table = match self.table_for_tag(KERN) {
Some(table) => table,
None => return None
};
let font_table = self.table_for_tag(KERN)?;
let mut result = CachedKernTable {
font_table: font_table,
pair_data_range: 0..0,

5
components/gfx/text/text_run.rs
View file

@ -149,10 +149,7 @@ impl<'a> Iterator for CharacterSliceIterator<'a> {
// inline(always) due to the inefficient rt failures messing up inline heuristics, I think.
#[inline(always)]
fn next(&mut self) -> Option<TextRunSlice<'a>> {
let glyph_run = match self.glyph_run {
None => return None,
Some(glyph_run) => glyph_run,
};
let glyph_run = self.glyph_run?;
debug_assert!(!self.range.is_empty());
let byte_start = self.range.begin();