aboutsummaryrefslogtreecommitdiff
path: root/src/useropts.rs
diff options
context:
space:
mode:
authorDaniel Schadt <kingdread@gmx.de>2021-10-07 22:25:14 +0200
committerDaniel Schadt <kingdread@gmx.de>2021-10-07 22:25:14 +0200
commit048e05b9d46bb33b45f8a31b9ec079aae7dd1cf1 (patch)
treee8a3ba940dcca6f0eb45109b7e5d08ea700310ed /src/useropts.rs
parent4327d932613b329e6e3b33d78f55662127bd4203 (diff)
downloadkondou-048e05b9d46bb33b45f8a31b9ec079aae7dd1cf1.tar.gz
kondou-048e05b9d46bb33b45f8a31b9ec079aae7dd1cf1.tar.bz2
kondou-048e05b9d46bb33b45f8a31b9ec079aae7dd1cf1.zip
Update dependencies
Some slight API changes in rusttype, but apart from that it's only version number bumps.
Diffstat (limited to 'src/useropts.rs')
-rw-r--r--src/useropts.rs9
1 files changed, 4 insertions, 5 deletions
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;
}