From b742606a5c1e063ae5b2b23ecb05c017ea5a7bfc Mon Sep 17 00:00:00 2001 From: michaelwright235 Date: Thu, 1 Jun 2023 15:50:12 +0300 Subject: [PATCH] sys: string: Remove repeating type Removes `UniChar` type because it's already defined in base.rs. --- core-foundation-sys/src/string.rs | 5 +---- core-text/src/font.rs | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core-foundation-sys/src/string.rs b/core-foundation-sys/src/string.rs index cf67528..39560fd 100644 --- a/core-foundation-sys/src/string.rs +++ b/core-foundation-sys/src/string.rs @@ -8,10 +8,7 @@ // except according to those terms. use std::os::raw::{c_char, c_ushort, c_void}; - -use base::{Boolean, CFOptionFlags, CFIndex, CFAllocatorRef, CFRange, CFTypeID}; - -pub type UniChar = c_ushort; +use base::{Boolean, CFOptionFlags, CFIndex, CFAllocatorRef, CFRange, CFTypeID, UniChar}; // CFString.h diff --git a/core-text/src/font.rs b/core-text/src/font.rs index 87a8a53..4cd7794 100644 --- a/core-text/src/font.rs +++ b/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}; +use core_foundation::base::{CFIndex, CFOptionFlags, CFType, CFTypeID, CFTypeRef, TCFType, UniChar}; use core_foundation::data::{CFData, CFDataRef}; use core_foundation::dictionary::{CFDictionary, CFDictionaryRef}; use core_foundation::number::CFNumber; -use core_foundation::string::{CFString, CFStringRef, UniChar}; +use core_foundation::string::{CFString, CFStringRef}; use core_foundation::url::{CFURL, CFURLRef}; use core_graphics::base::CGFloat; use core_graphics::context::CGContext;