Update objc2 to v0.3.0-beta.4

Author: madsmtm

cocoa-foundation/Cargo.toml

@@ -12,10 +12,10 @@ license = "MIT OR Apache-2.0"
 default-target = "x86_64-apple-darwin"
 
 [dependencies]
-block = { version = "=0.2.0-alpha.6", package = "block2" }
+block = { version = "=0.2.0-alpha.7", package = "block2" }
 bitflags = "1.0"
 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.2" }
-objc2-encode = { version = "=2.0.0-pre.2" }
+objc2 = { version = "=0.3.0-beta.4" }
+objc2-encode = { version = "=2.0.0-pre.3" }

cocoa-foundation/src/foundation.rs

@@ -12,7 +12,7 @@
 use base::{id, nil, BOOL, NO, SEL};
 use block::Block;
 use libc;
-use objc2_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 objc2_encode::{Encode, Encoding};
+    use objc2::encode::{Encode, Encoding};
     use std::mem;
 
     #[repr(C)]

cocoa/Cargo.toml

@@ -12,12 +12,11 @@ license = "MIT OR Apache-2.0"
 default-target = "x86_64-apple-darwin"
 
 [dependencies]
-block = { version = "=0.2.0-alpha.6", package = "block2" }
+block = { version = "=0.2.0-alpha.7", package = "block2" }
 bitflags = "1.0"
 libc = "0.2"
 cocoa-foundation = { path = "../cocoa-foundation", version = "0.1" }
 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.2" }
-objc2-encode = { version = "=2.0.0-pre.2" }
+objc2 = { version = "=0.3.0-beta.4" }

cocoa/src/lib.rs

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

cocoa/src/quartzcore.rs

@@ -21,6 +21,7 @@ use core_graphics::context::CGContext;
 use core_graphics::geometry::{CGAffineTransform, CGPoint, CGRect, CGSize};
 use core_graphics::path::{CGPath, SysCGPathRef};
 use foreign_types::ForeignType;
+use objc2::encode::{Encode, Encoding, RefEncode};
 use std::ops::Mul;
 use std::ptr;
 
@@ -1485,9 +1486,8 @@ pub struct CATransform3D {
     pub m44: CGFloat,
 }
 
-unsafe impl ::objc2_encode::Encode for CATransform3D {
-    const ENCODING: ::objc2_encode::Encoding =
-        ::objc2_encode::Encoding::Array(16, &CGFloat::ENCODING);
+unsafe impl Encode for CATransform3D {
+    const ENCODING: Encoding = Encoding::Array(16, &CGFloat::ENCODING);
 }
 
 impl PartialEq for CATransform3D {
@@ -1641,8 +1641,8 @@ pub struct CVTimeStamp {
     pub reserved: u64,
 }
 
-unsafe impl ::objc2_encode::Encode for CVTimeStamp {
-    const ENCODING: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Struct(
+unsafe impl Encode for CVTimeStamp {
+    const ENCODING: Encoding = Encoding::Struct(
         "CVTimeStamp",
         &[
             u32::ENCODING,
@@ -1658,9 +1658,8 @@ unsafe impl ::objc2_encode::Encode for CVTimeStamp {
     );
 }
 
-unsafe impl ::objc2_encode::RefEncode for CVTimeStamp {
-    const ENCODING_REF: ::objc2_encode::Encoding =
-        ::objc2_encode::Encoding::Pointer(&<Self as ::objc2_encode::Encode>::ENCODING);
+unsafe impl RefEncode for CVTimeStamp {
+    const ENCODING_REF: Encoding = Encoding::Pointer(&<Self as Encode>::ENCODING);
 }
 
 pub type CVTimeStampFlags = u64;
@@ -1691,8 +1690,8 @@ pub struct CVSMPTETime {
     pub frames: i16,
 }
 
-unsafe impl ::objc2_encode::Encode for CVSMPTETime {
-    const ENCODING: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Struct(
+unsafe impl Encode for CVSMPTETime {
+    const ENCODING: Encoding = 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]
-objc2-encode = { version = "=2.0.0-pre.2" }
+objc2-encode = { version = "=2.0.0-pre.3" }
 
 [features]
 mac_os_10_7_support = [] # backwards compatibility

core-graphics-types/Cargo.toml

@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 bitflags = "1.0"
 core-foundation = { path = "../core-foundation", version = "0.9" }
 libc = "0.2"
-objc2-encode = { version = "=2.0.0-pre.2" }
+objc2-encode = { version = "=2.0.0-pre.3" }
 
 [package.metadata.docs.rs]
 default-target = "x86_64-apple-darwin"

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.5.0"
 libc = "0.2"
-objc2-encode = { version = "=2.0.0-pre.2" }
+objc2-encode = { version = "=2.0.0-pre.3" }
 
 [package.metadata.docs.rs]
 default-target = "x86_64-apple-darwin"