Skip to content

Commit 7d593d0

Browse files
madsmtmmadsmtm
committed
Update objc2 to v0.3.0-beta.2
1 parent 812338c commit 7d593d0

File tree

14 files changed

+33
-36
lines changed

14 files changed

+33
-36
lines changed

‎cocoa-foundation/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ license = "MIT OR Apache-2.0"
1212
default-target = "x86_64-apple-darwin"
1313

1414
[dependencies]
15-
block = { version = "=0.2.0-alpha.5", package = "block2" }
15+
block = { version = "=0.2.0-alpha.6", package = "block2" }
1616
bitflags = "1.0"
1717
libc = "0.2"
1818
core-foundation = { path = "../core-foundation", version = "0.9" }
1919
core-graphics-types = { path = "../core-graphics-types", version = "0.1" }
20-
objc2 = { version = "=0.3.0-beta.1" }
21-
objc2-encode = { version = "=2.0.0-pre.1" }
20+
objc2 = { version = "=0.3.0-beta.2" }
21+
objc2-encode = { version = "=2.0.0-pre.2" }

‎cocoa-foundation/src/foundation.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ mod macos {
5454
}
5555

5656
unsafe impl Encode for NSPoint {
57-
const ENCODING: Encoding<'static> =
57+
const ENCODING: Encoding =
5858
Encoding::Struct("CGPoint", &[CGFloat::ENCODING, CGFloat::ENCODING]);
5959
}
6060

@@ -76,7 +76,7 @@ mod macos {
7676
}
7777

7878
unsafe impl Encode for NSSize {
79-
const ENCODING: Encoding<'static> =
79+
const ENCODING: Encoding =
8080
Encoding::Struct("CGSize", &[CGFloat::ENCODING, CGFloat::ENCODING]);
8181
}
8282

@@ -108,7 +108,7 @@ mod macos {
108108
}
109109

110110
unsafe impl Encode for NSRect {
111-
const ENCODING: Encoding<'static> =
111+
const ENCODING: Encoding =
112112
Encoding::Struct("CGRect", &[NSPoint::ENCODING, NSSize::ENCODING]);
113113
}
114114

@@ -152,7 +152,7 @@ pub struct NSRange {
152152
}
153153

154154
unsafe impl Encode for NSRange {
155-
const ENCODING: Encoding<'static> =
155+
const ENCODING: Encoding =
156156
Encoding::Struct("_NSRange", &[NSUInteger::ENCODING, NSUInteger::ENCODING]);
157157
}
158158

@@ -199,7 +199,7 @@ pub struct NSOperatingSystemVersion {
199199
}
200200

201201
unsafe impl Encode for NSOperatingSystemVersion {
202-
const ENCODING: Encoding<'static> = Encoding::Struct(
202+
const ENCODING: Encoding = Encoding::Struct(
203203
"NSOperatingSystemVersion",
204204
&[
205205
NSUInteger::ENCODING,
@@ -709,7 +709,7 @@ struct NSFastEnumerationState {
709709
}
710710

711711
unsafe impl Encode for NSFastEnumerationState {
712-
const ENCODING: Encoding<'static> = Encoding::Struct(
712+
const ENCODING: Encoding = Encoding::Struct(
713713
"?",
714714
&[
715715
libc::c_ulong::ENCODING,
@@ -721,7 +721,7 @@ unsafe impl Encode for NSFastEnumerationState {
721721
}
722722

723723
unsafe impl RefEncode for NSFastEnumerationState {
724-
const ENCODING_REF: Encoding<'static> = Encoding::Pointer(&Self::ENCODING);
724+
const ENCODING_REF: Encoding = Encoding::Pointer(&Self::ENCODING);
725725
}
726726

727727
const NS_FAST_ENUM_BUF_SIZE: usize = 16;

‎cocoa-foundation/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub use objc2_encode as __objc2_encode;
2525
macro_rules! impl_Encode {
2626
($t:ty, $delegation:ty) => {
2727
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;
2929
}
3030
};
3131
}

‎cocoa/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ license = "MIT OR Apache-2.0"
1212
default-target = "x86_64-apple-darwin"
1313

1414
[dependencies]
15-
block = { version = "=0.2.0-alpha.5", package = "block2" }
15+
block = { version = "=0.2.0-alpha.6", package = "block2" }
1616
bitflags = "1.0"
1717
libc = "0.2"
1818
cocoa-foundation = { path = "../cocoa-foundation", version = "0.1" }
1919
core-foundation = { path = "../core-foundation", version = "0.9" }
2020
core-graphics = { path = "../core-graphics", version = "0.23" }
2121
foreign-types = "0.5"
22-
objc2 = { version = "=0.3.0-beta.1" }
23-
objc2-encode = { version = "=2.0.0-pre.1" }
22+
objc2 = { version = "=0.3.0-beta.2" }
23+
objc2-encode = { version = "=2.0.0-pre.2" }

‎cocoa/src/quartzcore.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,7 @@ pub mod transaction {
14371437
#[inline]
14381438
pub fn set_completion_block<F>(block: ConcreteBlock<(), (), F>)
14391439
where
1440-
F: 'static + IntoConcreteBlock<(), Ret = ()>,
1440+
F: 'static + IntoConcreteBlock<(), Output = ()>,
14411441
{
14421442
unsafe {
14431443
let block = block.copy();
@@ -1486,7 +1486,7 @@ pub struct CATransform3D {
14861486
}
14871487

14881488
unsafe impl ::objc2_encode::Encode for CATransform3D {
1489-
const ENCODING: ::objc2_encode::Encoding<'static> =
1489+
const ENCODING: ::objc2_encode::Encoding =
14901490
::objc2_encode::Encoding::Array(16, &CGFloat::ENCODING);
14911491
}
14921492

@@ -1642,7 +1642,7 @@ pub struct CVTimeStamp {
16421642
}
16431643

16441644
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(
16461646
"CVTimeStamp",
16471647
&[
16481648
u32::ENCODING,
@@ -1659,7 +1659,7 @@ unsafe impl ::objc2_encode::Encode for CVTimeStamp {
16591659
}
16601660

16611661
unsafe impl ::objc2_encode::RefEncode for CVTimeStamp {
1662-
const ENCODING_REF: ::objc2_encode::Encoding<'static> =
1662+
const ENCODING_REF: ::objc2_encode::Encoding =
16631663
::objc2_encode::Encoding::Pointer(&<Self as ::objc2_encode::Encode>::ENCODING);
16641664
}
16651665

@@ -1692,7 +1692,7 @@ pub struct CVSMPTETime {
16921692
}
16931693

16941694
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(
16961696
"CVSMPTETime",
16971697
&[
16981698
i16::ENCODING,

‎core-foundation-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ authors = ["The Servo Project Developers"]
88
license = "MIT OR Apache-2.0"
99

1010
[dependencies]
11-
objc2-encode = { version = "=2.0.0-pre.1" }
11+
objc2-encode = { version = "=2.0.0-pre.2" }
1212

1313
[features]
1414
mac_os_10_7_support = [] # backwards compatibility

‎core-foundation-sys/src/array.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub type CFArrayRef = *const __CFArray;
3737
pub type CFMutableArrayRef = *mut __CFArray;
3838

3939
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;
4141
}
4242

4343
extern "C" {

‎core-foundation-sys/src/attributed_string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub type CFAttributedStringRef = *const __CFAttributedString;
2020
pub type CFMutableAttributedStringRef = *mut __CFAttributedString;
2121

2222
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;
2424
}
2525

2626
extern "C" {

‎core-foundation-sys/src/dictionary.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ pub type CFDictionaryRef = *const __CFDictionary;
5252
pub type CFMutableDictionaryRef = *mut __CFDictionary;
5353

5454
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;
5656
}
5757

5858
extern "C" {

‎core-foundation-sys/src/string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ pub fn CFStringGetCharacterFromInlineBuffer(buf: *mut CFStringInlineBuffer, idx:
207207
*/
208208

209209
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;
211211
}
212212

213213
extern "C" {

0 commit comments

Comments
 (0)