Auto merge of #198 - jrmuizel:set, r=jdm

Give CFSet a type parameter

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/core-foundation-rs/198)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo
2018-02-08 10:04:51 -05:00
committed by GitHub
+12 -6
View File
@@ -10,23 +10,29 @@
//! An immutable bag of elements.
pub use core_foundation_sys::set::*;
use core_foundation_sys::base::{CFTypeRef, kCFAllocatorDefault};
use core_foundation_sys::base::{CFTypeRef, CFRelease, kCFAllocatorDefault};
use base::{CFIndexConvertible, TCFType};
use std::mem;
use std::os::raw::c_void;
use std::marker::PhantomData;
/// An immutable bag of elements.
pub struct CFSet<T = *const c_void>(CFSetRef, PhantomData<T>);
declare_TCFType!{
/// An immutable bag of elements.
CFSet, CFSetRef
impl<T> Drop for CFSet<T> {
fn drop(&mut self) {
unsafe { CFRelease(self.as_CFTypeRef()) }
}
}
impl_TCFType!(CFSet, CFSetRef, CFSetGetTypeID);
impl_TCFType!(CFSet<T>, CFSetRef, CFSetGetTypeID);
impl_CFTypeDescription!(CFSet);
impl CFSet {
/// Creates a new set from a list of `CFType` instances.
pub fn from_slice<T>(elems: &[T]) -> CFSet where T: TCFType {
pub fn from_slice<T>(elems: &[T]) -> CFSet<T> where T: TCFType {
unsafe {
let elems: Vec<CFTypeRef> = elems.iter().map(|elem| elem.as_CFTypeRef()).collect();
let set_ref = CFSetCreate(kCFAllocatorDefault,