Use proper name of objc2_encode

madsmtm · madsmtm · commit c506e7d70da0 · 2022-07-20T05:17:18.000+02:00
diff --git a/cocoa-foundation/Cargo.toml b/cocoa-foundation/Cargo.toml
@@ -19,4 +19,4 @@ core-foundation = { path = "../core-foundation", version = "0.9" }
 core-graphics-types = { path = "../core-graphics-types", version = "0.1" }
 foreign-types = "0.3"
 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" }
diff --git a/cocoa-foundation/src/foundation.rs b/cocoa-foundation/src/foundation.rs
@@ -14,7 +14,7 @@ use std::os::raw::c_void;
 use base::{id, BOOL, NO, SEL, nil};
 use block::Block;
 use libc;
-use objc_encode::{Encode, Encoding, RefEncode};
+use objc2_encode::{Encode, Encoding, RefEncode};
 
 
 #[cfg(target_pointer_width = "32")]
@@ -38,7 +38,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};
 
     #[repr(C)]
     #[derive(Copy, Clone)]
diff --git a/cocoa-foundation/src/lib.rs b/cocoa-foundation/src/lib.rs
@@ -16,17 +16,17 @@ extern crate core_foundation;
 extern crate core_graphics_types;
 extern crate foreign_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;
         }
     }
 }
diff --git a/cocoa/Cargo.toml b/cocoa/Cargo.toml
@@ -20,4 +20,4 @@ core-foundation = { path = "../core-foundation", version = "0.9" }
 core-graphics = { path = "../core-graphics", version = "0.22" }
 foreign-types = "0.3"
 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" }
diff --git a/cocoa/src/lib.rs b/cocoa/src/lib.rs
@@ -21,7 +21,7 @@ extern crate core_graphics;
 extern crate cocoa_foundation;
 extern crate foreign_types;
 extern crate libc;
-extern crate objc_encode;
+extern crate objc2_encode;
 #[macro_use]
 extern crate objc2;
 
diff --git a/cocoa/src/quartzcore.rs b/cocoa/src/quartzcore.rs
@@ -1667,8 +1667,8 @@ pub struct CATransform3D {
     pub m41: CGFloat, pub m42: CGFloat, pub m43: CGFloat, 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 {
@@ -1823,8 +1823,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,
@@ -1840,9 +1840,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;
@@ -1873,8 +1873,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,
diff --git a/core-foundation-sys/Cargo.toml b/core-foundation-sys/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["The Servo Project Developers"]
 license = "MIT / 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
diff --git a/core-foundation-sys/src/array.rs b/core-foundation-sys/src/array.rs
@@ -35,8 +35,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 {
diff --git a/core-foundation-sys/src/attributed_string.rs b/core-foundation-sys/src/attributed_string.rs
@@ -18,8 +18,8 @@ pub struct __CFAttributedString(c_void);
 pub type CFAttributedStringRef = *const __CFAttributedString;
 pub type CFMutableAttributedStringRef = *const __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 {
diff --git a/core-foundation-sys/src/dictionary.rs b/core-foundation-sys/src/dictionary.rs
@@ -47,8 +47,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 {
diff --git a/core-foundation-sys/src/lib.rs b/core-foundation-sys/src/lib.rs
@@ -10,7 +10,7 @@
 
 #![cfg_attr(all(feature="mac_os_10_7_support", feature="mac_os_10_8_features"), feature(linkage))] // back-compat requires weak linkage
 
-extern crate objc_encode;
+extern crate objc2_encode;
 
 // Link to CoreFoundation on any Apple device.
 //
diff --git a/core-foundation-sys/src/string.rs b/core-foundation-sys/src/string.rs
@@ -192,8 +192,8 @@ pub struct __CFString(c_void);
 
 pub type CFStringRef = *const __CFString;
 
-unsafe impl ::objc_encode::RefEncode for __CFString {
-    const ENCODING_REF: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Object;
+unsafe impl ::objc2_encode::RefEncode for __CFString {
+    const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;
 }
 
 extern {
diff --git a/core-graphics-types/Cargo.toml b/core-graphics-types/Cargo.toml
@@ -12,7 +12,7 @@ bitflags = "1.0"
 core-foundation = { path = "../core-foundation", version = "0.9" }
 foreign-types = "0.3.0"
 libc = "0.2"
-objc-encode = { version = "=2.0.0-pre.1", package = "objc2-encode" }
+objc2-encode = { version = "=2.0.0-pre.1" }
 
 [package.metadata.docs.rs]
 default-target = "x86_64-apple-darwin"
diff --git a/core-graphics-types/src/geometry.rs b/core-graphics-types/src/geometry.rs
@@ -10,7 +10,7 @@
 use base::CGFloat;
 use core_foundation::base::TCFType;
 use core_foundation::dictionary::CFDictionary;
-use objc_encode::{Encode, Encoding};
+use objc2_encode::{Encode, Encoding};
 
 pub const CG_ZERO_POINT: CGPoint = CGPoint {
     x: 0.0,
diff --git a/core-graphics-types/src/lib.rs b/core-graphics-types/src/lib.rs
@@ -9,7 +9,7 @@
 
 extern crate libc;
 extern crate core_foundation;
-extern crate objc_encode;
+extern crate objc2_encode;
 
 pub mod base;
 pub mod geometry;
diff --git a/core-graphics/Cargo.toml b/core-graphics/Cargo.toml
@@ -18,7 +18,7 @@ core-foundation = { path = "../core-foundation", version = "0.9" }
 core-graphics-types = { path = "../core-graphics-types", version = "0.1" }
 foreign-types = "0.3.0"
 libc = "0.2"
-objc-encode = { version = "=2.0.0-pre.1", package = "objc2-encode" }
+objc2-encode = { version = "=2.0.0-pre.1" }
 
 [package.metadata.docs.rs]
 default-target = "x86_64-apple-darwin"
diff --git a/core-graphics/src/lib.rs b/core-graphics/src/lib.rs
@@ -8,7 +8,7 @@
 // except according to those terms.
 
 extern crate libc;
-extern crate objc_encode;
+extern crate objc2_encode;
 
 #[macro_use]
 extern crate core_foundation;
diff --git a/core-graphics/src/sys.rs b/core-graphics/src/sys.rs
@@ -1,6 +1,6 @@
 use std::os::raw::c_void;
 
-use objc_encode::{Encoding, RefEncode};
+use objc2_encode::{Encoding, RefEncode};
 
 pub enum CGImage {}
 pub type CGImageRef = *mut CGImage;

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ pub struct __CFArray(c_void);`
`35`	`35`	`pub type CFArrayRef = *const __CFArray;`
`36`	`36`	`pub type CFMutableArrayRef = *mut __CFArray;`
`37`	`37`
`38`		`-unsafe impl ::objc_encode::RefEncode for __CFArray {`
`39`		`- const ENCODING_REF: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Object;`
	`38`	`+unsafe impl ::objc2_encode::RefEncode for __CFArray {`
	`39`	`+ const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`extern {`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ pub struct __CFAttributedString(c_void);`
`18`	`18`	`pub type CFAttributedStringRef = *const __CFAttributedString;`
`19`	`19`	`pub type CFMutableAttributedStringRef = *const __CFAttributedString;`
`20`	`20`
`21`		`-unsafe impl ::objc_encode::RefEncode for __CFAttributedString {`
`22`		`- const ENCODING_REF: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Object;`
	`21`	`+unsafe impl ::objc2_encode::RefEncode for __CFAttributedString {`
	`22`	`+ const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`extern {`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ pub struct __CFDictionary(c_void);`
`47`	`47`	`pub type CFDictionaryRef = *const __CFDictionary;`
`48`	`48`	`pub type CFMutableDictionaryRef = *mut __CFDictionary;`
`49`	`49`
`50`		`-unsafe impl ::objc_encode::RefEncode for __CFDictionary {`
`51`		`- const ENCODING_REF: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Object;`
	`50`	`+unsafe impl ::objc2_encode::RefEncode for __CFDictionary {`
	`51`	`+ const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`extern {`