diff options
author | David Hewitt <1939362+davidhewitt@users.noreply.github.com> | 2020-01-15 22:14:07 +0000 |
---|---|---|
committer | Christian Duerr <contact@christianduerr.com> | 2020-01-15 23:14:07 +0100 |
commit | f54aabfe9295902b6bbe0db115186ca26f1956b0 (patch) | |
tree | aebd591cfa1d14ec2a111064e501bb0a4d431145 /font/src/darwin | |
parent | 7d1edf01c2d16eedbbfb652b1e57db0f819f12c0 (diff) | |
download | alacritty-f54aabfe9295902b6bbe0db115186ca26f1956b0.tar.gz alacritty-f54aabfe9295902b6bbe0db115186ca26f1956b0.zip |
Update font crate to 2018 edition
Diffstat (limited to 'font/src/darwin')
-rw-r--r-- | font/src/darwin/mod.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/font/src/darwin/mod.rs b/font/src/darwin/mod.rs index f95802fc..2914b0b5 100644 --- a/font/src/darwin/mod.rs +++ b/font/src/darwin/mod.rs @@ -18,8 +18,6 @@ use std::collections::HashMap; use std::path::PathBuf; use std::ptr; -use {Slant, Style, Weight}; - use core_foundation::array::{CFArray, CFIndex}; use core_foundation::string::CFString; use core_graphics::base::kCGImageAlphaPremultipliedFirst; @@ -42,12 +40,14 @@ use core_text::font_descriptor::{CTFontDescriptor, CTFontOrientation}; use euclid::{Point2D, Rect, Size2D}; -use super::{BitmapBuffer, FontDesc, FontKey, GlyphKey, Metrics, RasterizedGlyph}; +use log::{trace, warn}; pub mod byte_order; -use self::byte_order::kCGBitmapByteOrder32Host; +use byte_order::kCGBitmapByteOrder32Host; -use super::Size; +use super::{ + BitmapBuffer, FontDesc, FontKey, GlyphKey, Metrics, RasterizedGlyph, Size, Slant, Style, Weight, +}; /// Font descriptor /// @@ -124,7 +124,7 @@ impl ::std::fmt::Display for Error { } } -impl ::Rasterize for Rasterizer { +impl crate::Rasterize for Rasterizer { type Err = Error; fn new(device_pixel_ratio: f32, use_thin_strokes: bool) -> Result<Rasterizer, Error> { |