Update objc2 to v0.3.0-beta.2

madsmtm · madsmtm · commit 036c3de1c9fa · 2022-08-29T03:39:40.000+02:00
diff --git a/cocoa-foundation/Cargo.toml b/cocoa-foundation/Cargo.toml
@@ -12,11 +12,11 @@ license = "MIT / Apache-2.0"
 default-target = "x86_64-apple-darwin"
 
 [dependencies]
-block = { version = "=0.2.0-alpha.5", package = "block2" }
+block = { version = "=0.2.0-alpha.6", 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" }
 foreign-types = "0.3"
-objc2 = { version = "=0.3.0-beta.1" }
-objc2-encode = { version = "=2.0.0-pre.1" }
+objc2 = { version = "=0.3.0-beta.2" }
+objc2-encode = { version = "=2.0.0-pre.2" }
diff --git a/cocoa-foundation/src/foundation.rs b/cocoa-foundation/src/foundation.rs
@@ -58,7 +58,7 @@ mod macos {
     }
 
     unsafe impl Encode for NSPoint {
-        const ENCODING: Encoding<'static> =
+        const ENCODING: Encoding =
             Encoding::Struct("CGPoint", &[CGFloat::ENCODING, CGFloat::ENCODING]);
     }
 
@@ -80,7 +80,7 @@ mod macos {
     }
 
     unsafe impl Encode for NSSize {
-        const ENCODING: Encoding<'static> =
+        const ENCODING: Encoding =
             Encoding::Struct("CGSize", &[CGFloat::ENCODING, CGFloat::ENCODING]);
     }
 
@@ -116,7 +116,7 @@ mod macos {
     }
 
     unsafe impl Encode for NSRect {
-        const ENCODING: Encoding<'static> =
+        const ENCODING: Encoding =
             Encoding::Struct("CGRect", &[NSPoint::ENCODING, NSSize::ENCODING]);
     }
 
@@ -161,7 +161,7 @@ pub struct NSRange {
 }
 
 unsafe impl Encode for NSRange {
-    const ENCODING: Encoding<'static> =
+    const ENCODING: Encoding =
         Encoding::Struct("_NSRange", &[NSUInteger::ENCODING, NSUInteger::ENCODING]);
 }
 
@@ -209,7 +209,7 @@ pub struct NSOperatingSystemVersion {
 }
 
 unsafe impl Encode for NSOperatingSystemVersion {
-    const ENCODING: Encoding<'static> = Encoding::Struct(
+    const ENCODING: Encoding = Encoding::Struct(
         "NSOperatingSystemVersion",
         &[
             NSUInteger::ENCODING,
@@ -681,7 +681,7 @@ struct NSFastEnumerationState {
 }
 
 unsafe impl Encode for NSFastEnumerationState {
-    const ENCODING: Encoding<'static> = Encoding::Struct(
+    const ENCODING: Encoding = Encoding::Struct(
         "?",
         &[
             libc::c_ulong::ENCODING,
@@ -693,7 +693,7 @@ unsafe impl Encode for NSFastEnumerationState {
 }
 
 unsafe impl RefEncode for NSFastEnumerationState {
-    const ENCODING_REF: Encoding<'static> = Encoding::Pointer(&Self::ENCODING);
+    const ENCODING_REF: Encoding = Encoding::Pointer(&Self::ENCODING);
 }
 
 const NS_FAST_ENUM_BUF_SIZE: usize = 16;
diff --git a/cocoa-foundation/src/lib.rs b/cocoa-foundation/src/lib.rs
@@ -26,7 +26,7 @@ pub use objc2_encode as __objc2_encode;
 macro_rules! impl_Encode {
     ($t:ty, $delegation:ty) => {
         unsafe impl $crate::__objc2_encode::Encode for $t {
-            const ENCODING: $crate::__objc2_encode::Encoding<'static> = <$delegation>::ENCODING;
+            const ENCODING: $crate::__objc2_encode::Encoding = <$delegation>::ENCODING;
         }
     }
 }
diff --git a/cocoa/Cargo.toml b/cocoa/Cargo.toml
@@ -12,12 +12,12 @@ license = "MIT / Apache-2.0"
 default-target = "x86_64-apple-darwin"
 
 [dependencies]
-block = { version = "=0.2.0-alpha.5", package = "block2" }
+block = { version = "=0.2.0-alpha.6", 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.22" }
 foreign-types = "0.3"
-objc2 = { version = "=0.3.0-beta.1" }
-objc2-encode = { version = "=2.0.0-pre.1" }
+objc2 = { version = "=0.3.0-beta.2" }
+objc2-encode = { version = "=2.0.0-pre.2" }
diff --git a/cocoa/src/quartzcore.rs b/cocoa/src/quartzcore.rs
@@ -1632,7 +1632,7 @@ pub mod transaction {
 
     #[inline]
     pub fn set_completion_block<F>(block: ConcreteBlock<(), (), F>)
-                                   where F: 'static + IntoConcreteBlock<(), Ret = ()> {
+                                   where F: 'static + IntoConcreteBlock<(), Output = ()> {
         unsafe {
             let block = block.copy();
             msg_send![class!(CATransaction), setCompletionBlock:&*block]
@@ -1668,7 +1668,7 @@ pub struct CATransform3D {
 }
 
 unsafe impl ::objc2_encode::Encode for CATransform3D {
-    const ENCODING: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Array(16, &CGFloat::ENCODING);
+    const ENCODING: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Array(16, &CGFloat::ENCODING);
 }
 
 impl PartialEq for CATransform3D {
@@ -1824,7 +1824,7 @@ pub struct CVTimeStamp {
 }
 
 unsafe impl ::objc2_encode::Encode for CVTimeStamp {
-    const ENCODING: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Struct(
+    const ENCODING: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Struct(
         "CVTimeStamp",
         &[
             u32::ENCODING,
@@ -1841,7 +1841,7 @@ unsafe impl ::objc2_encode::Encode for CVTimeStamp {
 }
 
 unsafe impl ::objc2_encode::RefEncode for CVTimeStamp {
-    const ENCODING_REF: ::objc2_encode::Encoding<'static> =
+    const ENCODING_REF: ::objc2_encode::Encoding =
         ::objc2_encode::Encoding::Pointer(&<Self as ::objc2_encode::Encode>::ENCODING);
 }
 
@@ -1874,7 +1874,7 @@ pub struct CVSMPTETime {
 }
 
 unsafe impl ::objc2_encode::Encode for CVSMPTETime {
-    const ENCODING: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Struct(
+    const ENCODING: ::objc2_encode::Encoding = ::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]
-objc2-encode = { version = "=2.0.0-pre.1" }
+objc2-encode = { version = "=2.0.0-pre.2" }
 
 [features]
 mac_os_10_7_support = [] # backwards compatibility
diff --git a/core-foundation-sys/src/array.rs b/core-foundation-sys/src/array.rs
@@ -36,7 +36,7 @@ pub type CFArrayRef = *const __CFArray;
 pub type CFMutableArrayRef = *mut __CFArray;
 
 unsafe impl ::objc2_encode::RefEncode for __CFArray {
-    const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;
+    const ENCODING_REF: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Object;
 }
 
 extern {
diff --git a/core-foundation-sys/src/attributed_string.rs b/core-foundation-sys/src/attributed_string.rs
@@ -19,7 +19,7 @@ pub type CFAttributedStringRef = *const __CFAttributedString;
 pub type CFMutableAttributedStringRef = *const __CFAttributedString;
 
 unsafe impl ::objc2_encode::RefEncode for __CFAttributedString {
-    const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;
+    const ENCODING_REF: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Object;
 }
 
 extern {
diff --git a/core-foundation-sys/src/dictionary.rs b/core-foundation-sys/src/dictionary.rs
@@ -48,7 +48,7 @@ pub type CFDictionaryRef = *const __CFDictionary;
 pub type CFMutableDictionaryRef = *mut __CFDictionary;
 
 unsafe impl ::objc2_encode::RefEncode for __CFDictionary {
-    const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;
+    const ENCODING_REF: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Object;
 }
 
 extern {
diff --git a/core-foundation-sys/src/string.rs b/core-foundation-sys/src/string.rs
@@ -193,7 +193,7 @@ pub struct __CFString(c_void);
 pub type CFStringRef = *const __CFString;
 
 unsafe impl ::objc2_encode::RefEncode for __CFString {
-    const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;
+    const ENCODING_REF: ::objc2_encode::Encoding = ::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"
-objc2-encode = { version = "=2.0.0-pre.1" }
+objc2-encode = { version = "=2.0.0-pre.2" }
 
 [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
@@ -41,7 +41,7 @@ pub struct CGSize {
 }
 
 unsafe impl Encode for CGSize {
-    const ENCODING: Encoding<'static> =
+    const ENCODING: Encoding =
         Encoding::Struct("CGSize", &[CGFloat::ENCODING, CGFloat::ENCODING]);
 }
 
@@ -70,7 +70,7 @@ pub struct CGPoint {
 }
 
 unsafe impl Encode for CGPoint {
-    const ENCODING: Encoding<'static> =
+    const ENCODING: Encoding =
         Encoding::Struct("CGPoint", &[CGFloat::ENCODING, CGFloat::ENCODING]);
 }
 
@@ -99,7 +99,7 @@ pub struct CGRect {
 }
 
 unsafe impl Encode for CGRect {
-    const ENCODING: Encoding<'static> =
+    const ENCODING: Encoding =
         Encoding::Struct("CGRect", &[CGPoint::ENCODING, CGSize::ENCODING]);
 }
 
@@ -168,7 +168,7 @@ pub struct CGAffineTransform {
 }
 
 unsafe impl Encode for CGAffineTransform {
-    const ENCODING: Encoding<'static> = Encoding::Struct(
+    const ENCODING: Encoding = Encoding::Struct(
         "CGAffineTransform",
         &[
             CGFloat::ENCODING,
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"
-objc2-encode = { version = "=2.0.0-pre.1" }
+objc2-encode = { version = "=2.0.0-pre.2" }
 
 [package.metadata.docs.rs]
 default-target = "x86_64-apple-darwin"
diff --git a/core-graphics/src/sys.rs b/core-graphics/src/sys.rs
@@ -9,7 +9,7 @@ pub type CGImageRef = *mut CGImage;
 pub struct __CGColor(c_void);
 
 unsafe impl RefEncode for __CGColor {
-    const ENCODING_REF: Encoding<'static> = Encoding::Unknown;
+    const ENCODING_REF: Encoding = Encoding::Unknown;
 }
 
 pub type CGColorRef = *const __CGColor;
@@ -21,7 +21,7 @@ pub enum CGPath {}
 pub type CGPathRef = *mut CGPath;
 
 unsafe impl RefEncode for CGPath {
-    const ENCODING_REF: Encoding<'static> = Encoding::Unknown;
+    const ENCODING_REF: Encoding = Encoding::Unknown;
 }
 
 pub enum CGDataProvider {}
@@ -34,7 +34,7 @@ pub enum CGContext {}
 pub type CGContextRef = *mut CGContext;
 
 unsafe impl RefEncode for CGContext {
-    const ENCODING_REF: Encoding<'static> = Encoding::Unknown;
+    const ENCODING_REF: Encoding = Encoding::Unknown;
 }
 
 pub enum CGGradient {}

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ mod macos {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`unsafe impl Encode for NSPoint {`
`61`		`- const ENCODING: Encoding<'static> =`
	`61`	`+ const ENCODING: Encoding =`
`62`	`62`	`Encoding::Struct("CGPoint", &[CGFloat::ENCODING, CGFloat::ENCODING]);`
`63`	`63`	`}`
`64`	`64`
`@@ -80,7 +80,7 @@ mod macos {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`unsafe impl Encode for NSSize {`
`83`		`- const ENCODING: Encoding<'static> =`
	`83`	`+ const ENCODING: Encoding =`
`84`	`84`	`Encoding::Struct("CGSize", &[CGFloat::ENCODING, CGFloat::ENCODING]);`
`85`	`85`	`}`
`86`	`86`
`@@ -116,7 +116,7 @@ mod macos {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`unsafe impl Encode for NSRect {`
`119`		`- const ENCODING: Encoding<'static> =`
	`119`	`+ const ENCODING: Encoding =`
`120`	`120`	`Encoding::Struct("CGRect", &[NSPoint::ENCODING, NSSize::ENCODING]);`
`121`	`121`	`}`
`122`	`122`
`@@ -161,7 +161,7 @@ pub struct NSRange {`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`unsafe impl Encode for NSRange {`
`164`		`- const ENCODING: Encoding<'static> =`
	`164`	`+ const ENCODING: Encoding =`
`165`	`165`	`Encoding::Struct("_NSRange", &[NSUInteger::ENCODING, NSUInteger::ENCODING]);`
`166`	`166`	`}`
`167`	`167`
`@@ -209,7 +209,7 @@ pub struct NSOperatingSystemVersion {`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`unsafe impl Encode for NSOperatingSystemVersion {`
`212`		`- const ENCODING: Encoding<'static> = Encoding::Struct(`
	`212`	`+ const ENCODING: Encoding = Encoding::Struct(`
`213`	`213`	`"NSOperatingSystemVersion",`
`214`	`214`	`&[`
`215`	`215`	`NSUInteger::ENCODING,`
`@@ -681,7 +681,7 @@ struct NSFastEnumerationState {`
`681`	`681`	`}`
`682`	`682`
`683`	`683`	`unsafe impl Encode for NSFastEnumerationState {`
`684`		`- const ENCODING: Encoding<'static> = Encoding::Struct(`
	`684`	`+ const ENCODING: Encoding = Encoding::Struct(`
`685`	`685`	`"?",`
`686`	`686`	`&[`
`687`	`687`	`libc::c_ulong::ENCODING,`
`@@ -693,7 +693,7 @@ unsafe impl Encode for NSFastEnumerationState {`
`693`	`693`	`}`
`694`	`694`
`695`	`695`	`unsafe impl RefEncode for NSFastEnumerationState {`
`696`		`- const ENCODING_REF: Encoding<'static> = Encoding::Pointer(&Self::ENCODING);`
	`696`	`+ const ENCODING_REF: Encoding = Encoding::Pointer(&Self::ENCODING);`
`697`	`697`	`}`
`698`	`698`
`699`	`699`	`const NS_FAST_ENUM_BUF_SIZE: usize = 16;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ pub use objc2_encode as __objc2_encode;`
`26`	`26`	`macro_rules! impl_Encode {`
`27`	`27`	`($t:ty, $delegation:ty) => {`
`28`	`28`	`unsafe impl $crate::__objc2_encode::Encode for $t {`
`29`		`- const ENCODING: $crate::__objc2_encode::Encoding<'static> = <$delegation>::ENCODING;`
	`29`	`+ const ENCODING: $crate::__objc2_encode::Encoding = <$delegation>::ENCODING;`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1632,7 +1632,7 @@ pub mod transaction {`
`1632`	`1632`
`1633`	`1633`	`#[inline]`
`1634`	`1634`	`pub fn set_completion_block<F>(block: ConcreteBlock<(), (), F>)`
`1635`		`- where F: 'static + IntoConcreteBlock<(), Ret = ()> {`
	`1635`	`+ where F: 'static + IntoConcreteBlock<(), Output = ()> {`
`1636`	`1636`	`unsafe {`
`1637`	`1637`	`let block = block.copy();`
`1638`	`1638`	`msg_send![class!(CATransaction), setCompletionBlock:&*block]`
`@@ -1668,7 +1668,7 @@ pub struct CATransform3D {`
`1668`	`1668`	`}`
`1669`	`1669`
`1670`	`1670`	`unsafe impl ::objc2_encode::Encode for CATransform3D {`
`1671`		`- const ENCODING: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Array(16, &CGFloat::ENCODING);`
	`1671`	`+ const ENCODING: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Array(16, &CGFloat::ENCODING);`
`1672`	`1672`	`}`
`1673`	`1673`
`1674`	`1674`	`impl PartialEq for CATransform3D {`
`@@ -1824,7 +1824,7 @@ pub struct CVTimeStamp {`
`1824`	`1824`	`}`
`1825`	`1825`
`1826`	`1826`	`unsafe impl ::objc2_encode::Encode for CVTimeStamp {`
`1827`		`- const ENCODING: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Struct(`
	`1827`	`+ const ENCODING: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Struct(`
`1828`	`1828`	`"CVTimeStamp",`
`1829`	`1829`	`&[`
`1830`	`1830`	`u32::ENCODING,`
`@@ -1841,7 +1841,7 @@ unsafe impl ::objc2_encode::Encode for CVTimeStamp {`
`1841`	`1841`	`}`
`1842`	`1842`
`1843`	`1843`	`unsafe impl ::objc2_encode::RefEncode for CVTimeStamp {`
`1844`		`- const ENCODING_REF: ::objc2_encode::Encoding<'static> =`
	`1844`	`+ const ENCODING_REF: ::objc2_encode::Encoding =`
`1845`	`1845`	`::objc2_encode::Encoding::Pointer(&<Self as ::objc2_encode::Encode>::ENCODING);`
`1846`	`1846`	`}`
`1847`	`1847`
`@@ -1874,7 +1874,7 @@ pub struct CVSMPTETime {`
`1874`	`1874`	`}`
`1875`	`1875`
`1876`	`1876`	`unsafe impl ::objc2_encode::Encode for CVSMPTETime {`
`1877`		`- const ENCODING: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Struct(`
	`1877`	`+ const ENCODING: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Struct(`
`1878`	`1878`	`"CVSMPTETime",`
`1879`	`1879`	`&[`
`1880`	`1880`	`i16::ENCODING,`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ pub type CFArrayRef = *const __CFArray;`
`36`	`36`	`pub type CFMutableArrayRef = *mut __CFArray;`
`37`	`37`
`38`	`38`	`unsafe impl ::objc2_encode::RefEncode for __CFArray {`
`39`		`- const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;`
	`39`	`+ const ENCODING_REF: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Object;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`extern {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ pub type CFAttributedStringRef = *const __CFAttributedString;`
`19`	`19`	`pub type CFMutableAttributedStringRef = *const __CFAttributedString;`
`20`	`20`
`21`	`21`	`unsafe impl ::objc2_encode::RefEncode for __CFAttributedString {`
`22`		`- const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;`
	`22`	`+ const ENCODING_REF: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Object;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`extern {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ pub type CFDictionaryRef = *const __CFDictionary;`
`48`	`48`	`pub type CFMutableDictionaryRef = *mut __CFDictionary;`
`49`	`49`
`50`	`50`	`unsafe impl ::objc2_encode::RefEncode for __CFDictionary {`
`51`		`- const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;`
	`51`	`+ const ENCODING_REF: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Object;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`extern {`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ pub struct __CFString(c_void);`
`193`	`193`	`pub type CFStringRef = *const __CFString;`
`194`	`194`
`195`	`195`	`unsafe impl ::objc2_encode::RefEncode for __CFString {`
`196`		`- const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;`
	`196`	`+ const ENCODING_REF: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Object;`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`extern {`