From 048e05b9d46bb33b45f8a31b9ec079aae7dd1cf1 Mon Sep 17 00:00:00 2001
From: Daniel Schadt <kingdread@gmx.de>
Date: Thu, 7 Oct 2021 22:25:14 +0200
Subject: Update dependencies

Some slight API changes in rusttype, but apart from that it's only
version number bumps.
---
 src/render.rs   | 4 ++--
 src/useropts.rs | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/render.rs b/src/render.rs
index cb6a4fb..fa8e1df 100644
--- a/src/render.rs
+++ b/src/render.rs
@@ -6,7 +6,7 @@ use image::{
 };
 use imageproc::{drawing, rect::Rect};
 use num_traits::{Num, NumCast};
-use rusttype::{Font, Scale, SharedBytes};
+use rusttype::{Font, Scale};
 use serde::{Deserialize, Serialize};
 use std::{error::Error, fmt};
 
@@ -86,7 +86,7 @@ impl Default for RenderOptions {
             trait_size: 30,
             line_color: Rgba([0, 0, 0, 255]),
             line_height: 4,
-            font: Font::from_bytes(SharedBytes::ByRef(include_bytes!("LiberationMono.ttf")))
+            font: Font::try_from_bytes(include_bytes!("LiberationMono.ttf"))
                 .expect("Invalid font data for default font"),
             text_color: Rgba([0, 0, 0, 255]),
             text_size: 20,
diff --git a/src/useropts.rs b/src/useropts.rs
index b342839..27e14df 100644
--- a/src/useropts.rs
+++ b/src/useropts.rs
@@ -20,14 +20,13 @@ use super::render::{Alignment, RenderOptions};
 pub enum ConfigError {
     Io(io::Error),
     Serialization(toml::de::Error),
-    Font(rusttype::Error),
+    Font,
 }
 
 error_froms! {
     ConfigError,
     err: io::Error => ConfigError::Io(err),
     err: toml::de::Error => ConfigError::Serialization(err),
-    err: rusttype::Error => ConfigError::Font(err),
 }
 
 impl fmt::Display for ConfigError {
@@ -36,7 +35,7 @@ impl fmt::Display for ConfigError {
         match *self {
             ConfigError::Io(_) => write!(f, "input/output error"),
             ConfigError::Serialization(_) => write!(f, "serialization error"),
-            ConfigError::Font(_) => write!(f, "could not load the font"),
+            ConfigError::Font => write!(f, "could not load the font"),
         }
     }
 }
@@ -46,7 +45,7 @@ impl Error for ConfigError {
         match *self {
             ConfigError::Io(ref err) => Some(err),
             ConfigError::Serialization(ref err) => Some(err),
-            ConfigError::Font(ref err) => Some(err),
+            ConfigError::Font => None,
         }
     }
 }
@@ -109,7 +108,7 @@ impl UserOptions {
 
         if let Some(path) = self.font_path {
             let data = fs::read(path)?;
-            let font = Font::from_bytes(data)?;
+            let font = Font::try_from_vec(data).ok_or(ConfigError::Font)?;
             result.font = font;
         }
 
-- 
cgit v1.2.3