Update objc2 to v0.3.0-beta.2

madsmtm · madsmtm · commit 7d593d016175 · 2023-07-31T13:49:37.000+02:00
diff --git a/cocoa-foundation/Cargo.toml b/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.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" }
-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
@@ -54,7 +54,7 @@ mod macos {
     }
 
     unsafe impl Encode for NSPoint {
-        const ENCODING: Encoding<'static> =
+        const ENCODING: Encoding =
             Encoding::Struct("CGPoint", &[CGFloat::ENCODING, CGFloat::ENCODING]);
     }
 
@@ -76,7 +76,7 @@ mod macos {
     }
 
     unsafe impl Encode for NSSize {
-        const ENCODING: Encoding<'static> =
+        const ENCODING: Encoding =
             Encoding::Struct("CGSize", &[CGFloat::ENCODING, CGFloat::ENCODING]);
     }
 
@@ -108,7 +108,7 @@ mod macos {
     }
 
     unsafe impl Encode for NSRect {
-        const ENCODING: Encoding<'static> =
+        const ENCODING: Encoding =
             Encoding::Struct("CGRect", &[NSPoint::ENCODING, NSSize::ENCODING]);
     }
 
@@ -152,7 +152,7 @@ pub struct NSRange {
 }
 
 unsafe impl Encode for NSRange {
-    const ENCODING: Encoding<'static> =
+    const ENCODING: Encoding =
         Encoding::Struct("_NSRange", &[NSUInteger::ENCODING, NSUInteger::ENCODING]);
 }
 
@@ -199,7 +199,7 @@ pub struct NSOperatingSystemVersion {
 }
 
 unsafe impl Encode for NSOperatingSystemVersion {
-    const ENCODING: Encoding<'static> = Encoding::Struct(
+    const ENCODING: Encoding = Encoding::Struct(
         "NSOperatingSystemVersion",
         &[
             NSUInteger::ENCODING,
@@ -709,7 +709,7 @@ struct NSFastEnumerationState {
 }
 
 unsafe impl Encode for NSFastEnumerationState {
-    const ENCODING: Encoding<'static> = Encoding::Struct(
+    const ENCODING: Encoding = Encoding::Struct(
         "?",
         &[
             libc::c_ulong::ENCODING,
@@ -721,7 +721,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
@@ -25,7 +25,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 OR 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.23" }
 foreign-types = "0.5"
-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
@@ -1437,7 +1437,7 @@ pub mod transaction {
     #[inline]
     pub fn set_completion_block<F>(block: ConcreteBlock<(), (), F>)
     where
-        F: 'static + IntoConcreteBlock<(), Ret = ()>,
+        F: 'static + IntoConcreteBlock<(), Output = ()>,
     {
         unsafe {
             let block = block.copy();
@@ -1486,7 +1486,7 @@ pub struct CATransform3D {
 }
 
 unsafe impl ::objc2_encode::Encode for CATransform3D {
-    const ENCODING: ::objc2_encode::Encoding<'static> =
+    const ENCODING: ::objc2_encode::Encoding =
         ::objc2_encode::Encoding::Array(16, &CGFloat::ENCODING);
 }
 
@@ -1642,7 +1642,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,
@@ -1659,7 +1659,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);
 }
 
@@ -1692,7 +1692,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 OR 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
@@ -37,7 +37,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 "C" {
diff --git a/core-foundation-sys/src/attributed_string.rs b/core-foundation-sys/src/attributed_string.rs
@@ -20,7 +20,7 @@ pub type CFAttributedStringRef = *const __CFAttributedString;
 pub type CFMutableAttributedStringRef = *mut __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 "C" {
diff --git a/core-foundation-sys/src/dictionary.rs b/core-foundation-sys/src/dictionary.rs
@@ -52,7 +52,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 "C" {
diff --git a/core-foundation-sys/src/string.rs b/core-foundation-sys/src/string.rs
@@ -207,7 +207,7 @@ pub fn CFStringGetCharacterFromInlineBuffer(buf: *mut CFStringInlineBuffer, idx:
 */
 
 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 "C" {
diff --git a/core-graphics-types/Cargo.toml b/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.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,8 +41,7 @@ pub struct CGSize {
 }
 
 unsafe impl Encode for CGSize {
-    const ENCODING: Encoding<'static> =
-        Encoding::Struct("CGSize", &[CGFloat::ENCODING, CGFloat::ENCODING]);
+    const ENCODING: Encoding = Encoding::Struct("CGSize", &[CGFloat::ENCODING, CGFloat::ENCODING]);
 }
 
 impl CGSize {
@@ -68,8 +67,7 @@ pub struct CGPoint {
 }
 
 unsafe impl Encode for CGPoint {
-    const ENCODING: Encoding<'static> =
-        Encoding::Struct("CGPoint", &[CGFloat::ENCODING, CGFloat::ENCODING]);
+    const ENCODING: Encoding = Encoding::Struct("CGPoint", &[CGFloat::ENCODING, CGFloat::ENCODING]);
 }
 
 impl CGPoint {
@@ -92,8 +90,7 @@ pub struct CGRect {
 }
 
 unsafe impl Encode for CGRect {
-    const ENCODING: Encoding<'static> =
-        Encoding::Struct("CGRect", &[CGPoint::ENCODING, CGSize::ENCODING]);
+    const ENCODING: Encoding = Encoding::Struct("CGRect", &[CGPoint::ENCODING, CGSize::ENCODING]);
 }
 
 impl CGRect {
@@ -162,7 +159,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.5.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
`@@ -54,7 +54,7 @@ mod macos {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`unsafe impl Encode for NSPoint {`
`57`		`- const ENCODING: Encoding<'static> =`
	`57`	`+ const ENCODING: Encoding =`
`58`	`58`	`Encoding::Struct("CGPoint", &[CGFloat::ENCODING, CGFloat::ENCODING]);`
`59`	`59`	`}`
`60`	`60`
`@@ -76,7 +76,7 @@ mod macos {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`unsafe impl Encode for NSSize {`
`79`		`- const ENCODING: Encoding<'static> =`
	`79`	`+ const ENCODING: Encoding =`
`80`	`80`	`Encoding::Struct("CGSize", &[CGFloat::ENCODING, CGFloat::ENCODING]);`
`81`	`81`	`}`
`82`	`82`
`@@ -108,7 +108,7 @@ mod macos {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`unsafe impl Encode for NSRect {`
`111`		`- const ENCODING: Encoding<'static> =`
	`111`	`+ const ENCODING: Encoding =`
`112`	`112`	`Encoding::Struct("CGRect", &[NSPoint::ENCODING, NSSize::ENCODING]);`
`113`	`113`	`}`
`114`	`114`
`@@ -152,7 +152,7 @@ pub struct NSRange {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`unsafe impl Encode for NSRange {`
`155`		`- const ENCODING: Encoding<'static> =`
	`155`	`+ const ENCODING: Encoding =`
`156`	`156`	`Encoding::Struct("_NSRange", &[NSUInteger::ENCODING, NSUInteger::ENCODING]);`
`157`	`157`	`}`
`158`	`158`
`@@ -199,7 +199,7 @@ pub struct NSOperatingSystemVersion {`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`unsafe impl Encode for NSOperatingSystemVersion {`
`202`		`- const ENCODING: Encoding<'static> = Encoding::Struct(`
	`202`	`+ const ENCODING: Encoding = Encoding::Struct(`
`203`	`203`	`"NSOperatingSystemVersion",`
`204`	`204`	`&[`
`205`	`205`	`NSUInteger::ENCODING,`
`@@ -709,7 +709,7 @@ struct NSFastEnumerationState {`
`709`	`709`	`}`
`710`	`710`
`711`	`711`	`unsafe impl Encode for NSFastEnumerationState {`
`712`		`- const ENCODING: Encoding<'static> = Encoding::Struct(`
	`712`	`+ const ENCODING: Encoding = Encoding::Struct(`
`713`	`713`	`"?",`
`714`	`714`	`&[`
`715`	`715`	`libc::c_ulong::ENCODING,`
`@@ -721,7 +721,7 @@ unsafe impl Encode for NSFastEnumerationState {`
`721`	`721`	`}`
`722`	`722`
`723`	`723`	`unsafe impl RefEncode for NSFastEnumerationState {`
`724`		`- const ENCODING_REF: Encoding<'static> = Encoding::Pointer(&Self::ENCODING);`
	`724`	`+ const ENCODING_REF: Encoding = Encoding::Pointer(&Self::ENCODING);`
`725`	`725`	`}`
`726`	`726`
`727`	`727`	`const NS_FAST_ENUM_BUF_SIZE: usize = 16;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ pub use objc2_encode as __objc2_encode;`
`25`	`25`	`macro_rules! impl_Encode {`
`26`	`26`	`($t:ty, $delegation:ty) => {`
`27`	`27`	`unsafe impl $crate::__objc2_encode::Encode for $t {`
`28`		`- const ENCODING: $crate::__objc2_encode::Encoding<'static> = <$delegation>::ENCODING;`
	`28`	`+ const ENCODING: $crate::__objc2_encode::Encoding = <$delegation>::ENCODING;`
`29`	`29`	`}`
`30`	`30`	`};`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1437,7 +1437,7 @@ pub mod transaction {`
`1437`	`1437`	`#[inline]`
`1438`	`1438`	`pub fn set_completion_block<F>(block: ConcreteBlock<(), (), F>)`
`1439`	`1439`	`where`
`1440`		`- F: 'static + IntoConcreteBlock<(), Ret = ()>,`
	`1440`	`+ F: 'static + IntoConcreteBlock<(), Output = ()>,`
`1441`	`1441`	`{`
`1442`	`1442`	`unsafe {`
`1443`	`1443`	`let block = block.copy();`
`@@ -1486,7 +1486,7 @@ pub struct CATransform3D {`
`1486`	`1486`	`}`
`1487`	`1487`
`1488`	`1488`	`unsafe impl ::objc2_encode::Encode for CATransform3D {`
`1489`		`- const ENCODING: ::objc2_encode::Encoding<'static> =`
	`1489`	`+ const ENCODING: ::objc2_encode::Encoding =`
`1490`	`1490`	`::objc2_encode::Encoding::Array(16, &CGFloat::ENCODING);`
`1491`	`1491`	`}`
`1492`	`1492`
`@@ -1642,7 +1642,7 @@ pub struct CVTimeStamp {`
`1642`	`1642`	`}`
`1643`	`1643`
`1644`	`1644`	`unsafe impl ::objc2_encode::Encode for CVTimeStamp {`
`1645`		`- const ENCODING: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Struct(`
	`1645`	`+ const ENCODING: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Struct(`
`1646`	`1646`	`"CVTimeStamp",`
`1647`	`1647`	`&[`
`1648`	`1648`	`u32::ENCODING,`
`@@ -1659,7 +1659,7 @@ unsafe impl ::objc2_encode::Encode for CVTimeStamp {`
`1659`	`1659`	`}`
`1660`	`1660`
`1661`	`1661`	`unsafe impl ::objc2_encode::RefEncode for CVTimeStamp {`
`1662`		`- const ENCODING_REF: ::objc2_encode::Encoding<'static> =`
	`1662`	`+ const ENCODING_REF: ::objc2_encode::Encoding =`
`1663`	`1663`	`::objc2_encode::Encoding::Pointer(&<Self as ::objc2_encode::Encode>::ENCODING);`
`1664`	`1664`	`}`
`1665`	`1665`
`@@ -1692,7 +1692,7 @@ pub struct CVSMPTETime {`
`1692`	`1692`	`}`
`1693`	`1693`
`1694`	`1694`	`unsafe impl ::objc2_encode::Encode for CVSMPTETime {`
`1695`		`- const ENCODING: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Struct(`
	`1695`	`+ const ENCODING: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Struct(`
`1696`	`1696`	`"CVSMPTETime",`
`1697`	`1697`	`&[`
`1698`	`1698`	`i16::ENCODING,`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ pub type CFArrayRef = *const __CFArray;`
`37`	`37`	`pub type CFMutableArrayRef = *mut __CFArray;`
`38`	`38`
`39`	`39`	`unsafe impl ::objc2_encode::RefEncode for __CFArray {`
`40`		`- const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;`
	`40`	`+ const ENCODING_REF: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Object;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`extern "C" {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ pub type CFAttributedStringRef = *const __CFAttributedString;`
`20`	`20`	`pub type CFMutableAttributedStringRef = *mut __CFAttributedString;`
`21`	`21`
`22`	`22`	`unsafe impl ::objc2_encode::RefEncode for __CFAttributedString {`
`23`		`- const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;`
	`23`	`+ const ENCODING_REF: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Object;`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`extern "C" {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ pub type CFDictionaryRef = *const __CFDictionary;`
`52`	`52`	`pub type CFMutableDictionaryRef = *mut __CFDictionary;`
`53`	`53`
`54`	`54`	`unsafe impl ::objc2_encode::RefEncode for __CFDictionary {`
`55`		`- const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;`
	`55`	`+ const ENCODING_REF: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Object;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`extern "C" {`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ pub fn CFStringGetCharacterFromInlineBuffer(buf: *mut CFStringInlineBuffer, idx:`
`207`	`207`	`*/`
`208`	`208`
`209`	`209`	`unsafe impl ::objc2_encode::RefEncode for __CFString {`
`210`		`- const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;`
	`210`	`+ const ENCODING_REF: ::objc2_encode::Encoding = ::objc2_encode::Encoding::Object;`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`extern "C" {`