Replace objc's Id with the standalone objc_id crate.

Author: SSheldon

Cargo.toml

@@ -9,4 +9,5 @@ name = "objc_foundation"
 [dependencies]
 libc = "0.1"
 objc = "0.1"
+objc_id = "0.0"
 block = "0.0"

src/array.rs

@@ -2,8 +2,8 @@ use std::cmp::Ordering;
 use std::marker::PhantomData;
 use std::ops::{Index, Range};
 
-use objc::{Id, Owned, Ownership, Shared, ShareId};
 use objc::runtime::{Class, Object};
+use objc_id::{Id, Owned, Ownership, Shared, ShareId};
 
 use {INSCopying, INSFastEnumeration, INSMutableCopying, INSObject, NSEnumerator};
 
@@ -315,7 +315,7 @@ pub type NSMutableSharedArray<T> = NSMutableArray<T, Shared>;
 
 #[cfg(test)]
 mod tests {
-    use objc::{Id};
+    use objc_id::Id;
     use {INSObject, INSString, NSObject, NSString};
     use super::{INSArray, INSMutableArray, NSArray, NSMutableArray};
 

src/data.rs

@@ -3,7 +3,7 @@ use std::ops::Range;
 use std::slice;
 use libc::c_void;
 
-use objc::Id;
+use objc_id::Id;
 use block::{Block, ConcreteBlock};
 use {INSObject, INSCopying, INSMutableCopying, NSRange};
 

src/dictionary.rs

@@ -3,8 +3,8 @@ use std::marker::PhantomData;
 use std::ops::Index;
 use std::ptr;
 
-use objc::{Id, Owned, Ownership, ShareId};
 use objc::runtime::Class;
+use objc_id::{Id, Owned, Ownership, ShareId};
 
 use {
     INSArray, INSFastEnumeration, INSCopying, INSObject,
@@ -148,7 +148,7 @@ impl<'a, K, V> Index<&'a K> for NSDictionary<K, V> where K: INSObject, V: INSObj
 
 #[cfg(test)]
 mod tests {
-    use objc::{Id};
+    use objc_id::Id;
     use {INSArray, INSObject, INSString, NSObject, NSString};
     use super::{INSDictionary, NSDictionary};
 

src/enumerator.rs

@@ -4,8 +4,8 @@ use std::ptr;
 use std::slice;
 use libc::c_ulong;
 
-use objc::Id;
 use objc::runtime::Object;
+use objc_id::Id;
 
 use INSObject;
 

src/lib.rs

@@ -4,6 +4,7 @@
 extern crate libc;
 #[macro_use]
 extern crate objc;
+extern crate objc_id;
 extern crate block;
 
 pub use self::array::{

src/object.rs

@@ -1,5 +1,6 @@
+use objc::Message;
 use objc::runtime::{BOOL, Class, NO};
-use objc::{Id, Message, ShareId};
+use objc_id::{Id, ShareId};
 
 use NSString;
 

src/string.rs

@@ -2,7 +2,7 @@ use std::slice;
 use std::str;
 use libc::c_char;
 
-use objc::{Id, ShareId};
+use objc_id::{Id, ShareId};
 
 use INSObject;
 

src/value.rs

@@ -4,8 +4,9 @@ use std::mem;
 use std::str;
 use libc::c_char;
 
-use objc::{Encode, Id};
+use objc::Encode;
 use objc::runtime::Class;
+use objc_id::Id;
 
 use {INSCopying, INSObject};