Merge pull request #421 from madsmtm/small-fixes

Update nightly Rust version and fix `objc2` docs.rs build
madsmtm · Feb 7, 2023 · c01ca1e · c01ca1e
2 parents c7b6b58 + 4376891
commit c01ca1e
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ env:
     --package=objc2-encode
     --package=objc2-proc-macros
   # The current nightly Rust version that our CI uses
-  CURRENT_NIGHTLY: nightly-2023-01-15
+  CURRENT_NIGHTLY: nightly-2023-02-07
   # Various features that we'd usually want to test with
   #
   # Note: The `exception` feature is not enabled here, since it requires

diff --git a/crates/objc2/Cargo.toml b/crates/objc2/Cargo.toml
@@ -90,7 +90,7 @@ harness = false
 
 [package.metadata.docs.rs]
 default-target = "x86_64-apple-darwin"
-features = ["exception", "malloc", "block", "unstable-docsrs"]
+features = ["exception", "malloc", "unstable-docsrs"]
 
 targets = [
     # MacOS

diff --git a/crates/test-ui/ui/declare_class_invalid_type2.stderr b/crates/test-ui/ui/declare_class_invalid_type2.stderr
@@ -8,7 +8,7 @@ error[E0271]: type mismatch resolving `<Id<NSObject, Shared> as MaybeUnwrap>::In
 ... |
   | |     }
   | | );
-  | |_^ expected struct `CustomObject`, found struct `NSObject`
+  | |_^ expected `Id<CustomObject, _>`, found `Id<NSObject, Shared>`
   |
   = note: expected struct `Id<CustomObject, _>`
              found struct `Id<NSObject, Shared>`

diff --git a/crates/test-ui/ui/extern_methods_invalid_type.stderr b/crates/test-ui/ui/extern_methods_invalid_type.stderr
@@ -62,7 +62,7 @@ error[E0308]: mismatched types
   | | );
   | | ^
   | | |
-  | |_expected enum `Option`, found `&mut MyObject`
+  | |_expected `Option<Allocated<_>>`, found `&mut MyObject`
   |   arguments to this function are incorrect
   |
   = note:           expected enum `Option<Allocated<_>>`

diff --git a/crates/test-ui/ui/msg_send_id_alloc_init_different.stderr b/crates/test-ui/ui/msg_send_id_alloc_init_different.stderr
@@ -2,7 +2,7 @@ error[E0271]: type mismatch resolving `<Id<Object, Shared> as MaybeUnwrap>::Inpu
  --> ui/msg_send_id_alloc_init_different.rs
   |
   |     let _: Id<Object, Shared> = unsafe { msg_send_id![obj, init] };
-  |                                          ^^^^^^^^^^^^^^^^^^^^^^^ expected struct `NSObject`, found struct `Object`
+  |                                          ^^^^^^^^^^^^^^^^^^^^^^^ expected `Id<NSObject, _>`, found `Id<Object, Shared>`
   |
   = note: expected struct `Id<NSObject, _>`
              found struct `Id<objc2::runtime::Object, Shared>`

diff --git a/crates/test-ui/ui/msg_send_id_invalid_receiver.stderr b/crates/test-ui/ui/msg_send_id_invalid_receiver.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
   |     let _: Allocated<Object> = unsafe { msg_send_id![obj, alloc] };
   |                                         -------------^^^--------
   |                                         |            |
-  |                                         |            expected struct `Class`, found struct `Object`
+  |                                         |            expected `&Class`, found `&Object`
   |                                         arguments to this function are incorrect
   |
   = note: expected reference `&objc2::runtime::Class`
@@ -21,7 +21,7 @@ error[E0308]: mismatched types
   |     let _: Id<Object, Shared> = unsafe { msg_send_id![obj, init] };
   |                                          -------------^^^-------
   |                                          |            |
-  |                                          |            expected enum `Option`, found `&Object`
+  |                                          |            expected `Option<Allocated<_>>`, found `&Object`
   |                                          arguments to this function are incorrect
   |
   = note:   expected enum `Option<Allocated<_>>`
@@ -38,7 +38,7 @@ error[E0308]: mismatched types
   |     let _: Id<Object, Shared> = unsafe { msg_send_id![cls, init] };
   |                                          -------------^^^-------
   |                                          |            |
-  |                                          |            expected enum `Option`, found `&Class`
+  |                                          |            expected `Option<Allocated<_>>`, found `&Class`
   |                                          arguments to this function are incorrect
   |
   = note:   expected enum `Option<Allocated<_>>`
@@ -55,7 +55,7 @@ error[E0308]: mismatched types
   |     let _: Id<Object, Shared> = unsafe { msg_send_id![obj, init] };
   |                                          -------------^^^-------
   |                                          |            |
-  |                                          |            expected enum `Option`, found struct `Id`
+  |                                          |            expected `Option<Allocated<_>>`, found `Id<Object, Shared>`
   |                                          arguments to this function are incorrect
   |
   = note: expected enum `Option<Allocated<_>>`
@@ -72,7 +72,7 @@ error[E0308]: mismatched types
   |     let _: Id<Object, Shared> = unsafe { msg_send_id![obj, init] };
   |                                          -------------^^^-------
   |                                          |            |
-  |                                          |            expected struct `Allocated`, found struct `Id`
+  |                                          |            expected `Option<Allocated<_>>`, found `Option<Id<Object, Shared>>`
   |                                          arguments to this function are incorrect
   |
   = note: expected enum `Option<Allocated<_>>`

diff --git a/crates/test-ui/ui/msg_send_id_invalid_return.stderr b/crates/test-ui/ui/msg_send_id_invalid_return.stderr
@@ -89,7 +89,7 @@ error[E0271]: type mismatch resolving `<Id<Object, Shared> as MaybeUnwrap>::Inpu
  --> ui/msg_send_id_invalid_return.rs
   |
   |     let _: Id<Object, Shared> = unsafe { msg_send_id![cls, alloc] };
-  |                                          ^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `Allocated`, found struct `Id`
+  |                                          ^^^^^^^^^^^^^^^^^^^^^^^^ expected `Allocated<_>`, found `Id<Object, Shared>`
   |
   = note: expected struct `Allocated<_>`
              found struct `Id<objc2::runtime::Object, Shared>`
@@ -104,7 +104,7 @@ error[E0271]: type mismatch resolving `<Id<Allocated<Object>, Shared> as MaybeUn
  --> ui/msg_send_id_invalid_return.rs
   |
   |     let _: Id<Allocated<Object>, Shared> = unsafe { msg_send_id![cls, alloc] };
-  |                                                     ^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `Allocated`, found struct `Id`
+  |                                                     ^^^^^^^^^^^^^^^^^^^^^^^^ expected `Allocated<_>`, found `Id<Allocated<Object>, Shared>`
   |
   = note: expected struct `Allocated<_>`
              found struct `Id<Allocated<objc2::runtime::Object>, Shared>`
@@ -137,7 +137,7 @@ error[E0271]: type mismatch resolving `<Id<Class, Shared> as MaybeUnwrap>::Input
  --> ui/msg_send_id_invalid_return.rs
   |
   |     let _: Id<Class, Shared> = unsafe { msg_send_id![obj, init] };
-  |                                         ^^^^^^^^^^^^^^^^^^^^^^^ expected struct `Object`, found struct `Class`
+  |                                         ^^^^^^^^^^^^^^^^^^^^^^^ expected `Id<Object, _>`, found `Id<Class, Shared>`
   |
   = note: expected struct `Id<objc2::runtime::Object, _>`
              found struct `Id<objc2::runtime::Class, Shared>`
@@ -152,7 +152,7 @@ error[E0271]: type mismatch resolving `<Id<NSObject, Shared> as MaybeUnwrap>::In
  --> ui/msg_send_id_invalid_return.rs
   |
   |     let _: Id<NSObject, Shared> = unsafe { msg_send_id![obj, init] };
-  |                                            ^^^^^^^^^^^^^^^^^^^^^^^ expected struct `Object`, found struct `NSObject`
+  |                                            ^^^^^^^^^^^^^^^^^^^^^^^ expected `Id<Object, _>`, found `Id<NSObject, Shared>`
   |
   = note: expected struct `Id<objc2::runtime::Object, _>`
              found struct `Id<NSObject, Shared>`

diff --git a/crates/test-ui/ui/msg_send_invalid_error.stderr b/crates/test-ui/ui/msg_send_invalid_error.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
  --> ui/msg_send_invalid_error.rs
   |
   |     let _: () = unsafe { msg_send![obj, a: _] };
-  |                          ^^^^^^^^^^^^^^^^^^^^ expected `()`, found enum `Result`
+  |                          ^^^^^^^^^^^^^^^^^^^^ expected `()`, found `Result<(), Id<_, Shared>>`
   |
   = note: expected unit type `()`
                   found enum `Result<(), Id<_, Shared>>`
@@ -12,7 +12,7 @@ error[E0308]: mismatched types
  --> ui/msg_send_invalid_error.rs
   |
   |     let _: Result<i32, _> = unsafe { msg_send![obj, b: _] };
-  |                                      ^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `()`
+  |                                      ^^^^^^^^^^^^^^^^^^^^ expected `Result<i32, _>`, found `Result<(), Id<_, Shared>>`
   |
   = note: expected enum `Result<i32, _>`
              found enum `Result<(), Id<_, Shared>>`
@@ -27,7 +27,7 @@ error[E0308]: mismatched types
  --> ui/msg_send_invalid_error.rs
   |
   |     let _: Result<(), i32> = unsafe { msg_send![obj, c: _] };
-  |                                       ^^^^^^^^^^^^^^^^^^^^ expected `i32`, found struct `Id`
+  |                                       ^^^^^^^^^^^^^^^^^^^^ expected `Result<(), i32>`, found `Result<(), Id<_, Shared>>`
   |
   = note: expected enum `Result<_, i32>`
              found enum `Result<_, Id<_, Shared>>`
@@ -60,7 +60,7 @@ error[E0308]: mismatched types
  --> ui/msg_send_invalid_error.rs
   |
   |     let _: () = unsafe { msg_send![obj, e: obj, f: _] };
-  |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found enum `Result`
+  |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found `Result<(), Id<_, Shared>>`
   |
   = note: expected unit type `()`
                   found enum `Result<(), Id<_, Shared>>`
@@ -70,7 +70,7 @@ error[E0308]: mismatched types
  --> ui/msg_send_invalid_error.rs
   |
   |     let _: () = unsafe { msg_send![super(obj), g: _] };
-  |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found enum `Result`
+  |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found `Result<(), Id<_, Shared>>`
   |
   = note: expected unit type `()`
                   found enum `Result<(), Id<_, Shared>>`
@@ -80,7 +80,7 @@ error[E0308]: mismatched types
  --> ui/msg_send_invalid_error.rs
   |
   |     let _: () = unsafe { msg_send![super(obj, NSString::class()), h: _] };
-  |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found enum `Result`
+  |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found `Result<(), Id<_, Shared>>`
   |
   = note: expected unit type `()`
                   found enum `Result<(), Id<_, Shared>>`
@@ -90,7 +90,7 @@ error[E0308]: mismatched types
  --> ui/msg_send_invalid_error.rs
   |
   |     let _: () = unsafe { msg_send_id![obj, i: _] };
-  |                          ^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found enum `Result`
+  |                          ^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found `Result<Id<_, _>, Id<_, Shared>>`
   |
   = note: expected unit type `()`
                   found enum `Result<Id<_, _>, Id<_, Shared>>`