Update font crate to 2018 edition

7 files changed, 20 insertions, 18 deletions

diff --git a/font/src/ft/fc/char_set.rs b/font/src/ft/fc/char_set.rs
index 42c25b06..89554458 100644
--- a/font/src/ft/fc/char_set.rs
+++ b/font/src/ft/fc/char_set.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 use std::ptr::NonNull;
 
-use foreign_types::ForeignTypeRef;
+use foreign_types::{foreign_type, ForeignTypeRef};
 
 use super::ffi::FcCharSetCreate;
 use super::ffi::{FcCharSet, FcCharSetAddChar, FcCharSetDestroy};
diff --git a/font/src/ft/fc/config.rs b/font/src/ft/fc/config.rs
index 46a3a934..44bb9986 100644
--- a/font/src/ft/fc/config.rs
+++ b/font/src/ft/fc/config.rs
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-use foreign_types::ForeignTypeRef;
+use foreign_types::{foreign_type, ForeignTypeRef};
 
 use super::ffi::{FcConfig, FcConfigDestroy, FcConfigGetCurrent, FcConfigGetFonts};
 use super::{FontSetRef, SetName};
diff --git a/font/src/ft/fc/font_set.rs b/font/src/ft/fc/font_set.rs
index 632c80b0..ae746f45 100644
--- a/font/src/ft/fc/font_set.rs
+++ b/font/src/ft/fc/font_set.rs
@@ -14,7 +14,8 @@
 use std::ops::Deref;
 use std::ptr::NonNull;
 
-use foreign_types::{ForeignType, ForeignTypeRef};
+use foreign_types::{foreign_type, ForeignType, ForeignTypeRef};
+use log::trace;
 
 use super::{ConfigRef, ObjectSetRef, PatternRef};
 
diff --git a/font/src/ft/fc/mod.rs b/font/src/ft/fc/mod.rs
index ae8fb808..612f7c5a 100644
--- a/font/src/ft/fc/mod.rs
+++ b/font/src/ft/fc/mod.rs
@@ -19,29 +19,29 @@ use foreign_types::{ForeignType, ForeignTypeRef};
 
 use fontconfig::fontconfig as ffi;
 
-use self::ffi::FcResultNoMatch;
-use self::ffi::{FcFontList, FcFontMatch, FcFontSort};
-use self::ffi::{FcMatchFont, FcMatchPattern, FcMatchScan};
-use self::ffi::{FcSetApplication, FcSetSystem};
-use self::ffi::{FC_SLANT_ITALIC, FC_SLANT_OBLIQUE, FC_SLANT_ROMAN};
-use self::ffi::{FC_WEIGHT_BLACK, FC_WEIGHT_BOLD, FC_WEIGHT_EXTRABLACK, FC_WEIGHT_EXTRABOLD};
-use self::ffi::{FC_WEIGHT_BOOK, FC_WEIGHT_MEDIUM, FC_WEIGHT_REGULAR, FC_WEIGHT_SEMIBOLD};
-use self::ffi::{FC_WEIGHT_EXTRALIGHT, FC_WEIGHT_LIGHT, FC_WEIGHT_THIN};
+use ffi::FcResultNoMatch;
+use ffi::{FcFontList, FcFontMatch, FcFontSort};
+use ffi::{FcMatchFont, FcMatchPattern, FcMatchScan};
+use ffi::{FcSetApplication, FcSetSystem};
+use ffi::{FC_SLANT_ITALIC, FC_SLANT_OBLIQUE, FC_SLANT_ROMAN};
+use ffi::{FC_WEIGHT_BLACK, FC_WEIGHT_BOLD, FC_WEIGHT_EXTRABLACK, FC_WEIGHT_EXTRABOLD};
+use ffi::{FC_WEIGHT_BOOK, FC_WEIGHT_MEDIUM, FC_WEIGHT_REGULAR, FC_WEIGHT_SEMIBOLD};
+use ffi::{FC_WEIGHT_EXTRALIGHT, FC_WEIGHT_LIGHT, FC_WEIGHT_THIN};
 
 pub mod config;
-pub use self::config::{Config, ConfigRef};
+pub use config::{Config, ConfigRef};
 
 pub mod font_set;
-pub use self::font_set::{FontSet, FontSetRef};
+pub use font_set::{FontSet, FontSetRef};
 
 pub mod object_set;
-pub use self::object_set::{ObjectSet, ObjectSetRef};
+pub use object_set::{ObjectSet, ObjectSetRef};
 
 pub mod char_set;
-pub use self::char_set::{CharSet, CharSetRef};
+pub use char_set::{CharSet, CharSetRef};
 
 pub mod pattern;
-pub use self::pattern::{Pattern, PatternRef};
+pub use pattern::{Pattern, PatternRef};
 
 /// Find the font closest matching the provided pattern.
 ///
diff --git a/font/src/ft/fc/object_set.rs b/font/src/ft/fc/object_set.rs
index 1cc7e114..acaf352e 100644
--- a/font/src/ft/fc/object_set.rs
+++ b/font/src/ft/fc/object_set.rs
@@ -16,7 +16,7 @@ use std::ptr::NonNull;
 use libc::c_char;
 
 use super::ffi::{FcObjectSet, FcObjectSetAdd, FcObjectSetCreate, FcObjectSetDestroy};
-use foreign_types::ForeignTypeRef;
+use foreign_types::{foreign_type, ForeignTypeRef};
 
 foreign_type! {
     pub unsafe type ObjectSet {
diff --git a/font/src/ft/fc/pattern.rs b/font/src/ft/fc/pattern.rs
index 25007392..7d8d6430 100644
--- a/font/src/ft/fc/pattern.rs
+++ b/font/src/ft/fc/pattern.rs
@@ -18,7 +18,7 @@ use std::path::PathBuf;
 use std::ptr::{self, NonNull};
 use std::str;
 
-use foreign_types::{ForeignType, ForeignTypeRef};
+use foreign_types::{foreign_type, ForeignType, ForeignTypeRef};
 use libc::{c_char, c_double, c_int};
 
 use super::ffi::FcResultMatch;
diff --git a/font/src/ft/mod.rs b/font/src/ft/mod.rs
index 206d6042..d92ab7c4 100644
--- a/font/src/ft/mod.rs
+++ b/font/src/ft/mod.rs
@@ -22,6 +22,7 @@ use freetype::freetype_sys;
 use freetype::tt_os2::TrueTypeOS2Table;
 use freetype::{self, Library};
 use libc::c_uint;
+use log::{debug, trace};
 
 pub mod fc;