Add public EncodeReturn, EncodeArgument and EncodeArguments

And make the two conversion traits ConvertReturn and ConvertArgument in a sense "more" private

Author: madsmtm

src/block.rs

@@ -1,15 +1,14 @@
 use core::marker::PhantomData;
 use core::mem;
 
-use objc2::encode::__unstable::EncodeReturn;
-use objc2::encode::{Encode, Encoding, RefEncode};
+use objc2::encode::{EncodeArgument, EncodeReturn, Encoding, RefEncode};
 
 use crate::ffi;
 
 /// Types that may be used as the arguments of an Objective-C block.
 ///
 /// This is implemented for tuples of up to 12 arguments, where each argument
-/// implements [`Encode`].
+/// implements [`EncodeArgument`].
 ///
 ///
 /// # Safety
@@ -28,7 +27,7 @@ pub unsafe trait BlockArguments: Sized {
 
 macro_rules! block_args_impl {
     ($($a:ident: $t:ident),*) => (
-        unsafe impl<$($t: Encode),*> BlockArguments for ($($t,)*) {
+        unsafe impl<$($t: EncodeArgument),*> BlockArguments for ($($t,)*) {
             #[inline]
             unsafe fn __call_block<R: EncodeReturn>(
                 invoke: unsafe extern "C" fn(),

src/concrete_block.rs

@@ -5,8 +5,7 @@ use core::ops::Deref;
 use core::ptr;
 use std::os::raw::c_ulong;
 
-use objc2::encode::__unstable::EncodeReturn;
-use objc2::encode::{Encode, Encoding, RefEncode};
+use objc2::encode::{EncodeArgument, EncodeReturn, Encoding, RefEncode};
 
 use crate::{ffi, Block, BlockArguments, RcBlock};
 
@@ -17,7 +16,8 @@ mod private {
 /// Types that may be converted into a [`ConcreteBlock`].
 ///
 /// This is implemented for [`Fn`] closures of up to 12 arguments, where each
-/// argument and the return type implements [`Encode`].
+/// argument implements [`EncodeArgument`] and the return type implements
+/// [`EncodeReturn`].
 ///
 ///
 /// # Safety
@@ -37,12 +37,12 @@ macro_rules! concrete_block_impl {
         concrete_block_impl!($f,);
     );
     ($f:ident, $($a:ident : $t:ident),*) => (
-        impl<$($t: Encode,)* R: EncodeReturn, X> private::Sealed<($($t,)*)> for X
+        impl<$($t: EncodeArgument,)* R: EncodeReturn, X> private::Sealed<($($t,)*)> for X
         where
             X: Fn($($t,)*) -> R,
         {}
 
-        unsafe impl<$($t: Encode,)* R: EncodeReturn, X> IntoConcreteBlock<($($t,)*)> for X
+        unsafe impl<$($t: EncodeArgument,)* R: EncodeReturn, X> IntoConcreteBlock<($($t,)*)> for X
         where
             X: Fn($($t,)*) -> R,
         {

src/global.rs

@@ -5,7 +5,7 @@ use core::ops::Deref;
 use core::ptr;
 use std::os::raw::c_ulong;
 
-use objc2::encode::__unstable::EncodeReturn;
+use objc2::encode::EncodeReturn;
 
 use super::{ffi, Block};
 use crate::BlockArguments;