From 091296828a351b22564a760a8b322b165c03fd2b Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 16 Jan 2020 16:59:27 -0800 Subject: [PATCH] Replace `.nth(0)` with `.next()` Clippy[1] says that `.next()` is more readable than `.nth(0)`. [1]: https://rust-lang.github.io/rust-clippy/master/index.html#iter_nth_zero --- font/src/darwin/mod.rs | 3 +-- font/src/ft/fc/pattern.rs | 2 +- font/src/ft/mod.rs | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/font/src/darwin/mod.rs b/font/src/darwin/mod.rs index 2914b0b..b9266a8 100644 --- a/font/src/darwin/mod.rs +++ b/font/src/darwin/mod.rs @@ -338,8 +338,7 @@ impl Descriptor { let fallbacks = if load_fallbacks { descriptors_for_family("Menlo") .into_iter() - .filter(|d| d.font_name == "Menlo-Regular") - .nth(0) + .find(|d| d.font_name == "Menlo-Regular") .map(|descriptor| { let menlo = ct_new_from_descriptor(&descriptor.ct_descriptor, size); diff --git a/font/src/ft/fc/pattern.rs b/font/src/ft/fc/pattern.rs index 7d8d643..4fcea7a 100644 --- a/font/src/ft/fc/pattern.rs +++ b/font/src/ft/fc/pattern.rs @@ -518,7 +518,7 @@ impl PatternRef { } pub fn get_width(&self) -> Option { - unsafe { self.get_integer(b"width\0").nth(0).map(Width::from) } + unsafe { self.get_integer(b"width\0").next().map(Width::from) } } pub fn rgba(&self) -> RgbaPropertyIter { diff --git a/font/src/ft/mod.rs b/font/src/ft/mod.rs index d92ab7c..5c5c4a7 100644 --- a/font/src/ft/mod.rs +++ b/font/src/ft/mod.rs @@ -251,7 +251,7 @@ impl FreeTypeRasterizer { } fn face_from_pattern(&mut self, pattern: &fc::Pattern) -> Result, Error> { - if let (Some(path), Some(index)) = (pattern.file(0), pattern.index().nth(0)) { + if let (Some(path), Some(index)) = (pattern.file(0), pattern.index().next()) { if let Some(key) = self.keys.get(&path) { return Ok(Some(*key)); } @@ -547,7 +547,7 @@ impl FreeTypeRasterizer { let config = fc::Config::get_current(); match fc::font_match(config, &mut pattern) { Some(pattern) => { - if let (Some(path), Some(_)) = (pattern.file(0), pattern.index().nth(0)) { + if let (Some(path), Some(_)) = (pattern.file(0), pattern.index().next()) { match self.keys.get(&path) { // We've previously loaded this font, so don't // load it again.