Update to 2018 edition. (#642)

This is the minimum fix required. It updates to use crate-relative
imports.

Author: waywardmonkeys

cocoa-foundation/Cargo.toml

@@ -7,6 +7,7 @@ repository = "https://github.com/servo/core-foundation-rs"
 version = "0.1.2"
 authors = ["The Servo Project Developers"]
 license = "MIT OR Apache-2.0"
+edition = "2018"
 
 [package.metadata.docs.rs]
 default-target = "x86_64-apple-darwin"

cocoa-foundation/src/foundation.rs

@@ -9,7 +9,7 @@
 
 #![allow(non_upper_case_globals)]
 
-use base::{id, nil, BOOL, NO, SEL};
+use crate::base::{id, nil, BOOL, NO, SEL};
 use block::Block;
 use libc;
 use std::os::raw::c_void;
@@ -32,7 +32,7 @@ const UTF8_ENCODING: usize = 4;
 
 #[cfg(target_os = "macos")]
 mod macos {
-    use base::id;
+    use crate::base::id;
     use core_graphics_types::base::CGFloat;
     use core_graphics_types::geometry::CGRect;
     use objc;

cocoa/Cargo.toml

@@ -7,6 +7,7 @@ repository = "https://github.com/servo/core-foundation-rs"
 version = "0.25.0"
 authors = ["The Servo Project Developers"]
 license = "MIT OR Apache-2.0"
+edition = "2018"
 
 [package.metadata.docs.rs]
 default-target = "x86_64-apple-darwin"

cocoa/src/appkit.rs

@@ -9,11 +9,11 @@
 
 #![allow(non_upper_case_globals)]
 
-use base::{id, BOOL, SEL};
-use block::Block;
-use foundation::{
+use crate::base::{id, BOOL, SEL};
+use crate::foundation::{
     NSInteger, NSPoint, NSRange, NSRect, NSRectEdge, NSSize, NSTimeInterval, NSUInteger,
 };
+use block::Block;
 use libc;
 
 pub use core_graphics::base::CGFloat;

cocoa/src/quartzcore.rs

@@ -24,9 +24,9 @@ use foreign_types::ForeignType;
 use std::ops::Mul;
 use std::ptr;
 
-use appkit::CGLContextObj;
-use base::{id, nil, BOOL, YES};
-use foundation::NSUInteger;
+use crate::appkit::CGLContextObj;
+use crate::base::{id, nil, BOOL, YES};
+use crate::foundation::NSUInteger;
 
 // CABase.h
 
@@ -1356,7 +1356,7 @@ pub mod transaction {
     use core_foundation::date::CFTimeInterval;
     use core_foundation::string::CFString;
 
-    use base::{id, BOOL, YES};
+    use crate::base::{id, BOOL, YES};
 
     #[inline]
     pub fn begin() {

core-foundation-sys/Cargo.toml

@@ -6,6 +6,7 @@ repository = "https://github.com/servo/core-foundation-rs"
 version = "0.8.6"
 authors = ["The Servo Project Developers"]
 license = "MIT OR Apache-2.0"
+edition = "2018"
 
 [dependencies]
 

core-foundation-sys/src/array.rs

@@ -9,8 +9,8 @@
 
 use std::os::raw::c_void;
 
-use base::{Boolean, CFAllocatorRef, CFComparatorFunction, CFIndex, CFRange, CFTypeID};
-use string::CFStringRef;
+use crate::base::{Boolean, CFAllocatorRef, CFComparatorFunction, CFIndex, CFRange, CFTypeID};
+use crate::string::CFStringRef;
 
 pub type CFArrayRetainCallBack =
     extern "C" fn(allocator: CFAllocatorRef, value: *const c_void) -> *const c_void;

core-foundation-sys/src/attributed_string.rs

@@ -7,11 +7,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use base::{Boolean, CFAllocatorRef, CFIndex, CFRange, CFTypeID, CFTypeRef};
-use dictionary::CFDictionaryRef;
+use crate::base::{Boolean, CFAllocatorRef, CFIndex, CFRange, CFTypeID, CFTypeRef};
+use crate::dictionary::CFDictionaryRef;
+use crate::string::CFMutableStringRef;
+use crate::string::CFStringRef;
 use std::os::raw::c_void;
-use string::CFMutableStringRef;
-use string::CFStringRef;
 
 #[repr(C)]
 pub struct __CFAttributedString(c_void);

core-foundation-sys/src/bag.rs

@@ -9,8 +9,8 @@
 
 use std::os::raw::c_void;
 
-use base::{Boolean, CFAllocatorRef, CFHashCode, CFIndex, CFTypeID};
-use string::CFStringRef;
+use crate::base::{Boolean, CFAllocatorRef, CFHashCode, CFIndex, CFTypeID};
+use crate::string::CFStringRef;
 
 #[repr(C)]
 pub struct __CFBag(c_void);

core-foundation-sys/src/base.rs

@@ -7,9 +7,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use crate::string::CFStringRef;
 use std::cmp::Ordering;
 use std::os::raw::{c_int, c_short, c_uchar, c_uint, c_ushort, c_void};
-use string::CFStringRef;
 
 pub type Boolean = u8;
 pub type mach_port_t = c_uint;