Use proper name of objc2_encode

Author: madsmtm

cocoa-foundation/Cargo.toml

@@ -18,4 +18,4 @@ libc = "0.2"
 core-foundation = { path = "../core-foundation", version = "0.9" }
 core-graphics-types = { path = "../core-graphics-types", version = "0.1" }
 objc2 = { version = "=0.3.0-beta.1" }
-objc-encode = { version = "=2.0.0-pre.1", package = "objc2-encode" }
+objc2-encode = { version = "=2.0.0-pre.1" }

cocoa-foundation/src/foundation.rs

@@ -12,7 +12,7 @@
 use base::{id, nil, BOOL, NO, SEL};
 use block::Block;
 use libc;
-use objc_encode::{Encode, Encoding, RefEncode};
+use objc2_encode::{Encode, Encoding, RefEncode};
 use std::os::raw::c_void;
 use std::ptr;
 
@@ -36,7 +36,7 @@ mod macos {
     use base::id;
     use core_graphics_types::base::CGFloat;
     use core_graphics_types::geometry::CGRect;
-    use objc_encode::{Encode, Encoding};
+    use objc2_encode::{Encode, Encoding};
     use std::mem;
 
     #[repr(C)]

cocoa-foundation/src/lib.rs

@@ -15,17 +15,17 @@ extern crate bitflags;
 extern crate core_foundation;
 extern crate core_graphics_types;
 extern crate libc;
-pub extern crate objc_encode;
+pub extern crate objc2_encode;
 #[macro_use]
 extern crate objc2;
 
-pub use objc_encode as __objc_encode;
+pub use objc2_encode as __objc2_encode;
 
 #[macro_export]
 macro_rules! impl_Encode {
     ($t:ty, $delegation:ty) => {
-        unsafe impl $crate::__objc_encode::Encode for $t {
-            const ENCODING: $crate::__objc_encode::Encoding<'static> = <$delegation>::ENCODING;
+        unsafe impl $crate::__objc2_encode::Encode for $t {
+            const ENCODING: $crate::__objc2_encode::Encoding<'static> = <$delegation>::ENCODING;
         }
     };
 }

cocoa/Cargo.toml

@@ -20,4 +20,4 @@ core-foundation = { path = "../core-foundation", version = "0.9" }
 core-graphics = { path = "../core-graphics", version = "0.23" }
 foreign-types = "0.5"
 objc2 = { version = "=0.3.0-beta.1" }
-objc-encode = { version = "=2.0.0-pre.1", package = "objc2-encode" }
+objc2-encode = { version = "=2.0.0-pre.1" }

cocoa/src/lib.rs

@@ -20,7 +20,7 @@ extern crate core_foundation;
 extern crate core_graphics;
 extern crate foreign_types;
 extern crate libc;
-extern crate objc_encode;
+extern crate objc2_encode;
 #[macro_use]
 extern crate objc2;
 

cocoa/src/quartzcore.rs

@@ -1485,9 +1485,9 @@ pub struct CATransform3D {
     pub m44: CGFloat,
 }
 
-unsafe impl ::objc_encode::Encode for CATransform3D {
-    const ENCODING: ::objc_encode::Encoding<'static> =
-        ::objc_encode::Encoding::Array(16, &CGFloat::ENCODING);
+unsafe impl ::objc2_encode::Encode for CATransform3D {
+    const ENCODING: ::objc2_encode::Encoding<'static> =
+        ::objc2_encode::Encoding::Array(16, &CGFloat::ENCODING);
 }
 
 impl PartialEq for CATransform3D {
@@ -1641,8 +1641,8 @@ pub struct CVTimeStamp {
     pub reserved: u64,
 }
 
-unsafe impl ::objc_encode::Encode for CVTimeStamp {
-    const ENCODING: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Struct(
+unsafe impl ::objc2_encode::Encode for CVTimeStamp {
+    const ENCODING: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Struct(
         "CVTimeStamp",
         &[
             u32::ENCODING,
@@ -1658,9 +1658,9 @@ unsafe impl ::objc_encode::Encode for CVTimeStamp {
     );
 }
 
-unsafe impl ::objc_encode::RefEncode for CVTimeStamp {
-    const ENCODING_REF: ::objc_encode::Encoding<'static> =
-        ::objc_encode::Encoding::Pointer(&<Self as ::objc_encode::Encode>::ENCODING);
+unsafe impl ::objc2_encode::RefEncode for CVTimeStamp {
+    const ENCODING_REF: ::objc2_encode::Encoding<'static> =
+        ::objc2_encode::Encoding::Pointer(&<Self as ::objc2_encode::Encode>::ENCODING);
 }
 
 pub type CVTimeStampFlags = u64;
@@ -1691,8 +1691,8 @@ pub struct CVSMPTETime {
     pub frames: i16,
 }
 
-unsafe impl ::objc_encode::Encode for CVSMPTETime {
-    const ENCODING: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Struct(
+unsafe impl ::objc2_encode::Encode for CVSMPTETime {
+    const ENCODING: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Struct(
         "CVSMPTETime",
         &[
             i16::ENCODING,

core-foundation-sys/Cargo.toml

@@ -8,7 +8,7 @@ authors = ["The Servo Project Developers"]
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-objc-encode = { version = "=2.0.0-pre.1", package = "objc2-encode" }
+objc2-encode = { version = "=2.0.0-pre.1" }
 
 [features]
 mac_os_10_7_support = [] # backwards compatibility

core-foundation-sys/src/array.rs

@@ -36,8 +36,8 @@ pub struct __CFArray(c_void);
 pub type CFArrayRef = *const __CFArray;
 pub type CFMutableArrayRef = *mut __CFArray;
 
-unsafe impl ::objc_encode::RefEncode for __CFArray {
-    const ENCODING_REF: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Object;
+unsafe impl ::objc2_encode::RefEncode for __CFArray {
+    const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;
 }
 
 extern "C" {

core-foundation-sys/src/attributed_string.rs

@@ -19,8 +19,8 @@ pub struct __CFAttributedString(c_void);
 pub type CFAttributedStringRef = *const __CFAttributedString;
 pub type CFMutableAttributedStringRef = *mut __CFAttributedString;
 
-unsafe impl ::objc_encode::RefEncode for __CFAttributedString {
-    const ENCODING_REF: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Object;
+unsafe impl ::objc2_encode::RefEncode for __CFAttributedString {
+    const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;
 }
 
 extern "C" {

core-foundation-sys/src/dictionary.rs

@@ -51,8 +51,8 @@ pub struct __CFDictionary(c_void);
 pub type CFDictionaryRef = *const __CFDictionary;
 pub type CFMutableDictionaryRef = *mut __CFDictionary;
 
-unsafe impl ::objc_encode::RefEncode for __CFDictionary {
-    const ENCODING_REF: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Object;
+unsafe impl ::objc2_encode::RefEncode for __CFDictionary {
+    const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;
 }
 
 extern "C" {