diff options
Diffstat (limited to 'font')
| -rw-r--r-- | font/src/darwin/mod.rs | 11 | ||||
| -rw-r--r-- | font/src/directwrite/mod.rs | 7 | ||||
| -rw-r--r-- | font/src/ft/mod.rs | 7 | ||||
| -rw-r--r-- | font/src/lib.rs | 2 |
4 files changed, 6 insertions, 21 deletions
diff --git a/font/src/darwin/mod.rs b/font/src/darwin/mod.rs index 62baa96b..0194925f 100644 --- a/font/src/darwin/mod.rs +++ b/font/src/darwin/mod.rs @@ -92,8 +92,8 @@ pub enum Error { impl ::std::error::Error for Error { fn description(&self) -> &str { match *self { - Error::MissingGlyph(ref _c) => "Couldn't find the requested glyph", - Error::MissingFont(ref _desc) => "Couldn't find the requested font", + Error::MissingGlyph(ref _c) => "Unable to find the requested glyph", + Error::MissingFont(ref _desc) => "Unable to find the requested font", Error::FontNotLoaded => "Tried to operate on font that hasn't been loaded", } } @@ -103,12 +103,7 @@ impl ::std::fmt::Display for Error { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { match *self { Error::MissingGlyph(ref c) => write!(f, "Glyph not found for char {:?}", c), - Error::MissingFont(ref desc) => write!( - f, - "Couldn't find a font with {}\n\tPlease check the font config in your \ - alacritty.yml.", - desc - ), + Error::MissingFont(ref desc) => write!(f, "Unable to find the font {}", desc), Error::FontNotLoaded => f.write_str("Tried to use a font that hasn't been loaded"), } } diff --git a/font/src/directwrite/mod.rs b/font/src/directwrite/mod.rs index c442cae9..d139b35e 100644 --- a/font/src/directwrite/mod.rs +++ b/font/src/directwrite/mod.rs @@ -266,12 +266,7 @@ impl Display for Error { fn fmt(&self, f: &mut Formatter) -> fmt::Result { match self { Error::MissingGlyph(c) => write!(f, "Glyph not found for char {:?}", c), - Error::MissingFont(desc) => write!( - f, - "Couldn't find a font with {}\n\tPlease check the font config in your \ - alacritty.yml.", - desc - ), + Error::MissingFont(desc) => write!(f, "Unable to find the font {}", desc), Error::FontNotLoaded => f.write_str("Tried to use a font that hasn't been loaded"), Error::DirectWriteError(hresult) => { write!(f, "A DirectWrite rendering error occurred: {:#X}", hresult) diff --git a/font/src/ft/mod.rs b/font/src/ft/mod.rs index 0798e087..07d5729b 100644 --- a/font/src/ft/mod.rs +++ b/font/src/ft/mod.rs @@ -769,12 +769,7 @@ impl Display for Error { fn fmt(&self, f: &mut Formatter) -> fmt::Result { match self { Error::FreeType(err) => err.fmt(f), - Error::MissingFont(err) => write!( - f, - "Couldn't find a font with {}\n\tPlease check the font config in your \ - alacritty.yml.", - err - ), + Error::MissingFont(err) => write!(f, "Unable to find the font {}", err), Error::FontNotLoaded => f.write_str("Tried to use a font that hasn't been loaded"), Error::MissingSizeMetrics => { f.write_str("Tried to get size metrics from a face without a size") diff --git a/font/src/lib.rs b/font/src/lib.rs index d6e2b3da..15cd46ff 100644 --- a/font/src/lib.rs +++ b/font/src/lib.rs @@ -75,7 +75,7 @@ impl FontDesc { impl fmt::Display for FontDesc { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "name {} and style {}", self.name, self.style) + write!(f, "{} - {}", self.name, self.style) } } |