Update to 2018 edition.

harfbuzz-sys/Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "harfbuzz-sys"
 version = "0.5.0"
+edition = "2018"
 
 authors = ["The Servo Project Developers"]
 license = "MIT"

harfbuzz-sys/build.rs

@@ -1,8 +1,3 @@
-#[cfg(feature = "build-native-harfbuzz")]
-extern crate cc;
-#[cfg(feature = "build-native-harfbuzz")]
-extern crate pkg_config;
-
 #[cfg(feature = "build-native-harfbuzz")]
 fn main() {
     use std::env;

harfbuzz-sys/src/coretext.rs

@@ -1,12 +1,8 @@
-extern crate core_graphics;
-extern crate core_text;
-extern crate foreign_types;
+use crate::{hb_face_t, hb_font_t};
 
-use {hb_face_t, hb_font_t};
-
-use self::core_graphics::font::CGFont;
-use self::core_text::font::CTFontRef;
-use self::foreign_types::ForeignType;
+use core_graphics::font::CGFont;
+use core_text::font::CTFontRef;
+use foreign_types::ForeignType;
 
 type CGFontRef = *mut <CGFont as ForeignType>::CType;
 

harfbuzz-sys/src/directwrite.rs

@@ -1,8 +1,6 @@
-extern crate winapi;
+use crate::hb_face_t;
 
-use hb_face_t;
-
-use self::winapi::um::dwrite::IDWriteFontFace;
+use winapi::um::dwrite::IDWriteFontFace;
 
 extern "C" {
     pub fn hb_directwrite_face_create(font_face: *mut IDWriteFontFace) -> *mut hb_face_t;

harfbuzz-sys/src/lib.rs

@@ -1,10 +1,3 @@
-#[cfg(any(
-    target_os = "android",
-    all(unix, not(target_vendor = "apple")),
-    feature = "build-native-freetype"
-))]
-extern crate freetype;
-
 #[cfg(target_vendor = "apple")]
 pub mod coretext;
 
@@ -26,4 +19,4 @@ extern "C" {
 #[allow(clippy::unreadable_literal)]
 mod bindings;
 
-pub use bindings::*;
+pub use crate::bindings::*;

harfbuzz/Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "harfbuzz"
 version = "0.4.0"
+edition = "2018"
 
 authors = ["The Servo Project Developers"]
 license = "MIT OR Apache-2.0"

harfbuzz/src/blob.rs

@@ -7,11 +7,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use crate::sys;
 use std::marker::PhantomData;
 use std::os::raw::{c_char, c_uint, c_void};
 use std::sync::Arc;
 use std::{mem, ops, ptr, slice};
-use sys;
 
 /// Blobs wrap a chunk of binary data to handle lifecycle management of data
 /// while it is passed between client and HarfBuzz.

harfbuzz/src/buffer.rs

@@ -7,10 +7,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use crate::sys;
 use std;
-use sys;
 
-use {Direction, Language};
+use crate::{Direction, Language};
 
 /// A series of Unicode characters.
 ///

harfbuzz/src/direction.rs

@@ -7,7 +7,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use sys;
+use crate::sys;
 
 /// Direction of text flow during layout.
 ///

harfbuzz/src/language.rs

@@ -9,8 +9,8 @@
 
 #![allow(missing_docs)]
 
+use crate::sys;
 use std;
-use sys;
 
 #[derive(Copy, Clone, PartialEq, PartialOrd)]
 pub struct Language {

harfbuzz/src/lib.rs

@@ -18,7 +18,7 @@
     unused_qualifications
 )]
 
-pub extern crate harfbuzz_sys as sys;
+pub use harfbuzz_sys as sys;
 
 mod buffer;
 pub use self::buffer::Buffer;