Remove objc2 dependency from core-foundation-sys and core-graphics

Author: madsmtm

cocoa/src/quartzcore.rs

@@ -7,9 +7,6 @@ version = "0.8.6"
 authors = ["The Servo Project Developers"]
 license = "MIT OR Apache-2.0"
 
-[dependencies]
-objc2 = "0.4.0"
-
 [features]
 mac_os_10_7_support = [] # backwards compatibility
 mac_os_10_8_features = [] # enables new features

core-foundation-sys/Cargo.toml

@@ -36,10 +36,6 @@ pub struct __CFArray(c_void);
 pub type CFArrayRef = *const __CFArray;
 pub type CFMutableArrayRef = *mut __CFArray;
 
-unsafe impl ::objc2::encode::RefEncode for __CFArray {
-    const ENCODING_REF: ::objc2::encode::Encoding = ::objc2::encode::Encoding::Object;
-}
-
 extern "C" {
     /*
      * CFArray.h

core-foundation-sys/src/array.rs

@@ -19,10 +19,6 @@ pub struct __CFAttributedString(c_void);
 pub type CFAttributedStringRef = *const __CFAttributedString;
 pub type CFMutableAttributedStringRef = *mut __CFAttributedString;
 
-unsafe impl ::objc2::encode::RefEncode for __CFAttributedString {
-    const ENCODING_REF: ::objc2::encode::Encoding = ::objc2::encode::Encoding::Object;
-}
-
 extern "C" {
     /*
      * CFAttributedString.h

core-foundation-sys/src/attributed_string.rs

@@ -51,10 +51,6 @@ pub struct __CFDictionary(c_void);
 pub type CFDictionaryRef = *const __CFDictionary;
 pub type CFMutableDictionaryRef = *mut __CFDictionary;
 
-unsafe impl ::objc2::encode::RefEncode for __CFDictionary {
-    const ENCODING_REF: ::objc2::encode::Encoding = ::objc2::encode::Encoding::Object;
-}
-
 extern "C" {
     /*
      * CFDictionary.h

core-foundation-sys/src/dictionary.rs

@@ -17,8 +17,6 @@
     feature(linkage)
 )] // back-compat requires weak linkage
 
-extern crate objc2;
-
 // Link to CoreFoundation on any Apple device.
 //
 // We don't use `target_vendor` since that is going to be deprecated:

core-foundation-sys/src/lib.rs

@@ -206,10 +206,6 @@ pub fn CFStringInitInlineBuffer(str: CFStringRef, buf: *mut CFStringInlineBuffer
 pub fn CFStringGetCharacterFromInlineBuffer(buf: *mut CFStringInlineBuffer, idx: CFIndex) -> UniChar;
 */
 
-unsafe impl ::objc2::encode::RefEncode for __CFString {
-    const ENCODING_REF: ::objc2::encode::Encoding = ::objc2::encode::Encoding::Object;
-}
-
 extern "C" {
     /*
      * CFString.h

core-foundation-sys/src/string.rs

@@ -18,7 +18,6 @@ core-foundation = { path = "../core-foundation", version = "0.9" }
 core-graphics-types = { path = "../core-graphics-types", version = "0.1" }
 foreign-types = "0.5.0"
 libc = "0.2"
-objc2 = "0.4.0"
 
 [package.metadata.docs.rs]
 default-target = "x86_64-apple-darwin"

core-graphics/Cargo.toml

@@ -8,7 +8,6 @@
 // except according to those terms.
 
 extern crate libc;
-extern crate objc2;
 
 #[macro_use]
 extern crate core_foundation;

core-graphics/src/lib.rs

@@ -1,17 +1,11 @@
 use std::os::raw::c_void;
 
-use objc2::encode::{Encoding, RefEncode};
-
 pub enum CGImage {}
 pub type CGImageRef = *mut CGImage;
 
 #[repr(C)]
 pub struct __CGColor(c_void);
 
-unsafe impl RefEncode for __CGColor {
-    const ENCODING_REF: Encoding = Encoding::Unknown;
-}
-
 pub type CGColorRef = *const __CGColor;
 
 pub enum CGColorSpace {}
@@ -20,10 +14,6 @@ pub type CGColorSpaceRef = *mut CGColorSpace;
 pub enum CGPath {}
 pub type CGPathRef = *mut CGPath;
 
-unsafe impl RefEncode for CGPath {
-    const ENCODING_REF: Encoding = Encoding::Unknown;
-}
-
 pub enum CGDataProvider {}
 pub type CGDataProviderRef = *mut CGDataProvider;
 
@@ -33,10 +23,6 @@ pub type CGFontRef = *mut CGFont;
 pub enum CGContext {}
 pub type CGContextRef = *mut CGContext;
 
-unsafe impl RefEncode for CGContext {
-    const ENCODING_REF: Encoding = Encoding::Unknown;
-}
-
 pub enum CGGradient {}
 pub type CGGradientRef = *mut CGGradient;