diff --git a/crates/header-translator/src/stmt.rs b/crates/header-translator/src/stmt.rs index 9fbc88fe4..8363e1fd9 100644 --- a/crates/header-translator/src/stmt.rs +++ b/crates/header-translator/src/stmt.rs @@ -1815,7 +1815,7 @@ impl Stmt { GenericTyHelper(cls_generics), )?; writeln!(f, " #[inline]")?; - writeln!(f, " fn default_id() -> Retained {{")?; + writeln!(f, " fn default_retained() -> Retained {{")?; writeln!(f, " Self::{}()", method.fn_name)?; writeln!(f, " }}")?; writeln!(f, "}}")?; diff --git a/crates/objc2/CHANGELOG.md b/crates/objc2/CHANGELOG.md index 4f5b098c2..7c541267d 100644 --- a/crates/objc2/CHANGELOG.md +++ b/crates/objc2/CHANGELOG.md @@ -117,6 +117,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). * **BREAKING**: Mark `Retained::autorelease` as `unsafe`, since we cannot ensure that the given pool is actually the innermost pool. * **BREAKING**: Removed the deprecated `malloc` feature and `malloc_buf` dependency. +* **BREAKING**: Removed aliases `DefaultId`, `IdFromIterator` and + `IdIntoIterator`, as well as their methods. Use the renamed traits instead. ### Fixed * Remove an incorrect assertion when adding protocols to classes in an unexpected diff --git a/crates/objc2/src/__framework_prelude.rs b/crates/objc2/src/__framework_prelude.rs index a4245800c..10f51f6b4 100644 --- a/crates/objc2/src/__framework_prelude.rs +++ b/crates/objc2/src/__framework_prelude.rs @@ -12,7 +12,7 @@ pub use core::ptr::NonNull; pub use crate::encode::{Encode, Encoding, RefEncode}; pub use crate::ffi::{NSInteger, NSIntegerMax, NSUInteger, NSUIntegerMax}; -pub use crate::rc::{Allocated, DefaultId, DefaultRetained, Id, Retained}; +pub use crate::rc::{Allocated, DefaultRetained, Retained}; pub use crate::runtime::{ AnyClass, AnyObject, Bool, NSObject, NSObjectProtocol, ProtocolObject, Sel, }; diff --git a/crates/objc2/src/rc/mod.rs b/crates/objc2/src/rc/mod.rs index c94849864..3633a1264 100644 --- a/crates/objc2/src/rc/mod.rs +++ b/crates/objc2/src/rc/mod.rs @@ -67,9 +67,3 @@ pub use self::retained_traits::{DefaultRetained, RetainedFromIterator, RetainedI #[cfg(test)] pub(crate) use self::test_object::{RcTestObject, ThreadTestData}; pub use self::weak::{Weak, WeakId}; - -// Soft-deprecated aliases -pub use self::retained_traits::{ - DefaultRetained as DefaultId, RetainedFromIterator as IdFromIterator, - RetainedIntoIterator as IdIntoIterator, -}; diff --git a/crates/objc2/src/rc/retained_traits.rs b/crates/objc2/src/rc/retained_traits.rs index c0de5d599..49fae7235 100644 --- a/crates/objc2/src/rc/retained_traits.rs +++ b/crates/objc2/src/rc/retained_traits.rs @@ -5,19 +5,11 @@ use super::Retained; /// Helper trait to implement [`Default`] on [`Retained`]. #[doc(alias = "DefaultId")] pub trait DefaultRetained { - /// The default [`Retained`] for a type. - /// - /// Soft-deprecated alias of [`DefaultRetained::default_retained`]. - fn default_id() -> Retained; - /// The default [`Retained`] for a type. /// /// On most objects the implementation would be sending a message to the /// `new` selector. - #[inline] - fn default_retained() -> Retained { - Self::default_id() - } + fn default_retained() -> Retained; } impl Default for Retained { @@ -45,19 +37,11 @@ pub trait RetainedIntoIterator { /// Which kind of iterator are we turning this into? type IntoIter: Iterator; - /// Creates an iterator from an [`Retained`]. - /// - /// Soft-deprecated alias of [`RetainedIntoIterator::retained_into_iter`]. - fn id_into_iter(this: Retained) -> Self::IntoIter; - /// Creates an iterator from an [`Retained`]. /// /// You would normally not call this function directly; instead, you'd /// call [`into_iter`](IntoIterator::into_iter) on an [`Retained`]. - #[inline] - fn retained_into_iter(this: Retained) -> Self::IntoIter { - Self::id_into_iter(this) - } + fn retained_into_iter(this: Retained) -> Self::IntoIter; } // Note: These `IntoIterator` implementations conflict with an `Iterator` @@ -118,20 +102,9 @@ where #[doc(alias = "IdFromIterator")] pub trait RetainedFromIterator: Sized { /// Creates an `Retained` from an iterator. - /// - /// Soft-deprecated alias of [`RetainedFromIterator::retained_from_iter`]. - fn id_from_iter(iter: I) -> Retained - where - I: IntoIterator; - - /// Creates an `Retained` from an iterator. - #[inline] fn retained_from_iter(iter: I) -> Retained where - I: IntoIterator, - { - Self::id_from_iter(iter) - } + I: IntoIterator; } impl> FromIterator for Retained { @@ -160,7 +133,7 @@ mod tests { ); impl DefaultRetained for Collection { - fn default_id() -> Retained { + fn default_retained() -> Retained { unsafe { msg_send_id![Collection::class(), new] } } } @@ -200,13 +173,15 @@ mod tests { type Item = Retained; type IntoIter = IntoIter; - fn id_into_iter(this: Retained) -> Self::IntoIter { + fn retained_into_iter(this: Retained) -> Self::IntoIter { IntoIter { _inner: this } } } impl RetainedFromIterator> for Collection { - fn id_from_iter>>(_iter: I) -> Retained { + fn retained_from_iter>>( + _iter: I, + ) -> Retained { Collection::default_retained() } } diff --git a/crates/objc2/src/rc/test_object.rs b/crates/objc2/src/rc/test_object.rs index 5cdca79de..0d51f4c0b 100644 --- a/crates/objc2/src/rc/test_object.rs +++ b/crates/objc2/src/rc/test_object.rs @@ -296,7 +296,7 @@ impl Drop for RcTestObject { } impl DefaultRetained for RcTestObject { - fn default_id() -> Retained { + fn default_retained() -> Retained { Self::new() } } diff --git a/crates/objc2/src/runtime/nsobject.rs b/crates/objc2/src/runtime/nsobject.rs index 887c89be9..110f04e51 100644 --- a/crates/objc2/src/runtime/nsobject.rs +++ b/crates/objc2/src/runtime/nsobject.rs @@ -448,7 +448,7 @@ impl fmt::Debug for NSObject { impl DefaultRetained for NSObject { #[inline] - fn default_id() -> Retained { + fn default_retained() -> Retained { Self::new() } } diff --git a/framework-crates/objc2-foundation/src/array.rs b/framework-crates/objc2-foundation/src/array.rs index 943d7fd5b..5d5f9e22f 100644 --- a/framework-crates/objc2-foundation/src/array.rs +++ b/framework-crates/objc2-foundation/src/array.rs @@ -429,21 +429,21 @@ impl<'a, T: Message> Extend<&'a T> for &NSMutableArray { } impl<'a, T: Message + 'a> RetainedFromIterator<&'a T> for NSArray { - fn id_from_iter>(iter: I) -> Retained { + fn retained_from_iter>(iter: I) -> Retained { let vec = Vec::from_iter(iter); Self::from_slice(&vec) } } impl RetainedFromIterator> for NSArray { - fn id_from_iter>>(iter: I) -> Retained { + fn retained_from_iter>>(iter: I) -> Retained { let vec = Vec::from_iter(iter); Self::from_retained_slice(&vec) } } impl<'a, T: Message + 'a> RetainedFromIterator<&'a T> for NSMutableArray { - fn id_from_iter>(iter: I) -> Retained { + fn retained_from_iter>(iter: I) -> Retained { // TODO: Is this, or is using `initWithCapacity` the most optimal? let vec = Vec::from_iter(iter); Self::from_slice(&vec) @@ -451,7 +451,7 @@ impl<'a, T: Message + 'a> RetainedFromIterator<&'a T> for NSMutableArray { } impl RetainedFromIterator> for NSMutableArray { - fn id_from_iter>>(iter: I) -> Retained { + fn retained_from_iter>>(iter: I) -> Retained { // TODO: Is this, or is using `initWithCapacity` the most optimal? let vec = Vec::from_iter(iter); Self::from_retained_slice(&vec) diff --git a/framework-crates/objc2-foundation/src/data.rs b/framework-crates/objc2-foundation/src/data.rs index 9c8e3f9ae..c5ebc6ac9 100644 --- a/framework-crates/objc2-foundation/src/data.rs +++ b/framework-crates/objc2-foundation/src/data.rs @@ -314,7 +314,7 @@ impl std::io::Write for &NSMutableData { #[cfg(feature = "block2")] impl RetainedFromIterator for NSData { - fn id_from_iter>(iter: I) -> Retained { + fn retained_from_iter>(iter: I) -> Retained { let vec = Vec::from_iter(iter); Self::from_vec(vec) } @@ -322,7 +322,7 @@ impl RetainedFromIterator for NSData { #[cfg(feature = "block2")] impl RetainedFromIterator for NSMutableData { - fn id_from_iter>(iter: I) -> Retained { + fn retained_from_iter>(iter: I) -> Retained { let vec = Vec::from_iter(iter); Self::from_vec(vec) } diff --git a/framework-crates/objc2-foundation/src/iter.rs b/framework-crates/objc2-foundation/src/iter.rs index 485c463bd..aed0f33de 100644 --- a/framework-crates/objc2-foundation/src/iter.rs +++ b/framework-crates/objc2-foundation/src/iter.rs @@ -638,7 +638,7 @@ macro_rules! __impl_into_iter { type IntoIter = $into_iter; #[inline] - fn id_into_iter(this: Retained) -> Self::IntoIter { + fn retained_into_iter(this: Retained) -> Self::IntoIter { $into_iter($crate::iter::IntoIter::$new_fn(this)) } } diff --git a/framework-crates/objc2-foundation/src/set.rs b/framework-crates/objc2-foundation/src/set.rs index 6815c5e39..16edb58d1 100644 --- a/framework-crates/objc2-foundation/src/set.rs +++ b/framework-crates/objc2-foundation/src/set.rs @@ -311,21 +311,21 @@ impl<'a, T: Message> Extend<&'a T> for &NSMutableSet { } impl<'a, T: Message + 'a> RetainedFromIterator<&'a T> for NSSet { - fn id_from_iter>(iter: I) -> Retained { + fn retained_from_iter>(iter: I) -> Retained { let vec = Vec::from_iter(iter); Self::from_slice(&vec) } } impl RetainedFromIterator> for NSSet { - fn id_from_iter>>(iter: I) -> Retained { + fn retained_from_iter>>(iter: I) -> Retained { let vec = Vec::from_iter(iter); Self::from_retained_slice(&vec) } } impl<'a, T: Message + 'a> RetainedFromIterator<&'a T> for NSMutableSet { - fn id_from_iter>(iter: I) -> Retained { + fn retained_from_iter>(iter: I) -> Retained { // TODO: Is this, or is using `initWithCapacity` the most optimal? let vec = Vec::from_iter(iter); Self::from_slice(&vec) @@ -333,7 +333,7 @@ impl<'a, T: Message + 'a> RetainedFromIterator<&'a T> for NSMutableSet { } impl RetainedFromIterator> for NSMutableSet { - fn id_from_iter>>(iter: I) -> Retained { + fn retained_from_iter>>(iter: I) -> Retained { // TODO: Is this, or is using `initWithCapacity` the most optimal? let vec = Vec::from_iter(iter); Self::from_retained_slice(&vec) diff --git a/generated b/generated index 128e42c4b..c952bf996 160000 --- a/generated +++ b/generated @@ -1 +1 @@ -Subproject commit 128e42c4b7aed72ce2cc4467f3c696a30fe87a25 +Subproject commit c952bf9965e02349b12bdc615c57c735f58f4147