Port data to sys crate

core-foundation-sys/src/data.rs

@@ -0,0 +1,19 @@
+use libc::c_void;
+
+use base::{CFAllocatorRef, CFTypeID, CFIndex};
+
+pub type CFDataRef = *const c_void;
+
+extern {
+    /*
+     * CFData.h
+     */
+
+    pub fn CFDataCreate(allocator: CFAllocatorRef,
+                        bytes: *const u8, length: CFIndex) -> CFDataRef;
+    //fn CFDataFind
+    pub fn CFDataGetBytePtr(theData: CFDataRef) -> *const u8;
+    pub fn CFDataGetLength(theData: CFDataRef) -> CFIndex;
+
+    pub fn CFDataGetTypeID() -> CFTypeID;
+}

core-foundation-sys/src/lib.rs

@@ -5,5 +5,6 @@ extern crate libc;
 pub mod array;
 pub mod base;
 pub mod bundle;
+pub mod data;
 pub mod number;
 pub mod string;

core-foundation/src/data.rs

@@ -9,19 +9,15 @@
 
 //! Core Foundation byte buffers.
 
-use core_foundation_sys::base::{CFAllocatorRef, CFIndex, CFRelease};
-use core_foundation_sys::base::{CFTypeID, kCFAllocatorDefault};
+use core_foundation_sys::base::{CFIndex, CFRelease};
+use core_foundation_sys::base::{kCFAllocatorDefault};
+use core_foundation_sys::data::*;
 use std::mem;
 use std::ops::Deref;
 use std::slice;
 
 use base::{CFIndexConvertible, TCFType};
 
-#[repr(C)]
-struct __CFData;
-
-pub type CFDataRef = *const __CFData;
-
 /// A byte buffer.
 pub struct CFData(CFDataRef);
 
@@ -71,18 +67,3 @@ impl Deref for CFData {
         self.bytes()
     }
 }
-
-#[link(name = "CoreFoundation", kind = "framework")]
-extern {
-    /*
-     * CFData.h
-     */
-
-    fn CFDataCreate(allocator: CFAllocatorRef,
-                    bytes: *const u8, length: CFIndex) -> CFDataRef;
-    //fn CFDataFind
-    fn CFDataGetBytePtr(theData: CFDataRef) -> *const u8;
-    fn CFDataGetLength(theData: CFDataRef) -> CFIndex;
-
-    fn CFDataGetTypeID() -> CFTypeID;
-}