sys: Move UniChar type back to string module

Fixes a semver breakage

Author: michaelwright235

core-foundation-sys/src/base.rs

@@ -34,7 +34,6 @@ pub type RegionCode = SInt16;
 pub type UTF32Char = c_uint;
 pub type UTF16Char = c_ushort;
 pub type UTF8Char = c_uchar;
-pub type UniChar = c_ushort;
 
 #[repr(isize)]
 #[derive(Clone, Copy, Debug, PartialEq)]

core-foundation-sys/src/characterset.rs

@@ -8,9 +8,9 @@
 // except according to those terms.
 
 use std::os::raw::c_void;
-use base::{Boolean, CFAllocatorRef, CFIndex, CFRange, CFTypeID, UTF32Char, UniChar};
+use base::{Boolean, CFAllocatorRef, CFIndex, CFRange, CFTypeID, UTF32Char};
 use data::CFDataRef;
-use string::CFStringRef;
+use string::{CFStringRef, UniChar};
 
 pub type CFCharacterSetPredefinedSet = CFIndex;
 

core-foundation-sys/src/string.rs

@@ -7,8 +7,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::os::raw::{c_char, c_void, c_ulong, c_double};
-use base::{Boolean, CFOptionFlags, CFIndex, CFAllocatorRef, ConstStr255Param, CFRange, CFTypeID, SInt32, UInt32, UInt8, UniChar, CFComparisonResult, StringPtr, ConstStringPtr, UTF32Char};
+use std::os::raw::{c_char, c_void, c_ulong, c_double, c_ushort};
+use base::{Boolean, CFOptionFlags, CFIndex, CFAllocatorRef, ConstStr255Param, CFRange, CFTypeID, SInt32, UInt32, UInt8, CFComparisonResult, StringPtr, ConstStringPtr, UTF32Char};
 use array::CFArrayRef;
 use data::CFDataRef;
 use dictionary::CFDictionaryRef;
@@ -27,6 +27,7 @@ pub const kCFCompareWidthInsensitive: CFStringCompareFlags = 256;
 pub const kCFCompareForcedOrdering: CFStringCompareFlags = 512;
 
 pub type CFStringEncoding = UInt32;
+pub type UniChar = c_ushort;
 
 // macOS built-in encodings.
 

core-text/src/font.rs

@@ -15,11 +15,11 @@ use font_descriptor::{CTFontSymbolicTraits, CTFontTraits, SymbolicTraitAccessors
 use font_manager::create_font_descriptor;
 
 use core_foundation::array::{CFArray, CFArrayRef};
-use core_foundation::base::{CFIndex, CFOptionFlags, CFType, CFTypeID, CFTypeRef, TCFType, UniChar};
+use core_foundation::base::{CFIndex, CFOptionFlags, CFType, CFTypeID, CFTypeRef, TCFType};
 use core_foundation::data::{CFData, CFDataRef};
 use core_foundation::dictionary::{CFDictionary, CFDictionaryRef};
 use core_foundation::number::CFNumber;
-use core_foundation::string::{CFString, CFStringRef};
+use core_foundation::string::{CFString, CFStringRef, UniChar};
 use core_foundation::url::{CFURL, CFURLRef};
 use core_graphics::base::CGFloat;
 use core_graphics::context::CGContext;