fix: build issue after rebase master(tui -> 0.10.0)

7sDream · Jul 26, 2020 · b2d966b · b2d966b
1 parent 9e07f94
commit b2d966b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/font/matcher/ct/font_info.rs b/src/font/matcher/ct/font_info.rs
@@ -28,7 +28,7 @@ pub struct FontInfo<'fs> {
 impl<'fs> FontInfo<'fs> {
     // TODO: Figure out how to get font face index in file from FontDescriptor
     #[allow(clippy::unused_self)]
-    fn font_face_index(&self) -> Option<usize> {
+    const fn font_face_index(&self) -> Option<usize> {
         Some(0)
     }
 }

diff --git a/src/preview/terminal/ui/mod.rs b/src/preview/terminal/ui/mod.rs
@@ -58,7 +58,9 @@ pub struct UI<'matcher, 'render, Library: CharRendererLoader<'render>> {
     state: State<'matcher, 'render, Library>,
 }
 
-impl<'matcher, 'render, Library: CharRendererLoader<'render>> UI<'matcher, 'render, Library> {
+impl<'matcher, 'render, Library: CharRendererLoader<'render> + 'render>
+    UI<'matcher, 'render, Library>
+{
     pub fn new(
         c: char, families: SortedFamilies<'matcher>, ft: &'render mut Library,
     ) -> Option<Self> {
@@ -77,7 +79,7 @@ impl<'matcher, 'render, Library: CharRendererLoader<'render>> UI<'matcher, 'rend
         let index = self.state.index();
         let title = format!("Fonts {}/{}", index + 1, families.len());
 
-        let list = List::new(families.iter().copied().map(ListItem::new).collect::<Vec<_>>())
+        let list = List::new(families.map(ListItem::new).collect::<Vec<_>>())
             .block(Block::default().title(Span::raw(title)).borders(Borders::ALL))
             .highlight_style(Style::default().fg(Color::LightBlue).add_modifier(Modifier::BOLD));