Skip to content

Commit

Permalink
Rename id files to retained to match new name
Browse files Browse the repository at this point in the history
Part of #617
  • Loading branch information
madsmtm committed Sep 17, 2024
1 parent 8a1ada0 commit f8b11ac
Show file tree
Hide file tree
Showing 55 changed files with 233 additions and 262 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crates/objc2/src/__macro_helpers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ mod image_info;
mod method_family;
mod module_info;
mod msg_send;
mod msg_send_id;
mod msg_send_retained;
mod writeback;

pub use self::cache::{CachedClass, CachedSel};
Expand All @@ -37,7 +37,7 @@ pub use self::method_family::{
};
pub use self::module_info::ModuleInfo;
pub use self::msg_send::MsgSend;
pub use self::msg_send_id::{MaybeUnwrap, MsgSendId, MsgSendSuperId};
pub use self::msg_send_retained::{MaybeUnwrap, MsgSendId, MsgSendSuperId};

/// Disallow using this passed in value in const and statics for forwards
/// compatibility (this function is not a `const` function).
Expand Down
16 changes: 8 additions & 8 deletions crates/objc2/src/rc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,25 +51,25 @@

mod allocated_partial_init;
mod autorelease;
mod id;
mod id_forwarding_impls;
mod id_traits;
mod retained;
mod retained_forwarding_impls;
mod retained_traits;
#[cfg(test)]
mod test_object;
mod weak_id;
mod weak;

pub use self::allocated_partial_init::{Allocated, PartialInit};
pub use self::autorelease::{
autoreleasepool, autoreleasepool_leaking, AutoreleasePool, AutoreleaseSafe,
};
pub use self::id::{Id, Retained};
pub use self::id_traits::{DefaultRetained, RetainedFromIterator, RetainedIntoIterator};
pub use self::retained::{Id, Retained};
pub use self::retained_traits::{DefaultRetained, RetainedFromIterator, RetainedIntoIterator};
#[cfg(test)]
pub(crate) use self::test_object::{RcTestObject, ThreadTestData};
pub use self::weak_id::{Weak, WeakId};
pub use self::weak::{Weak, WeakId};

// Soft-deprecated aliases
pub use self::id_traits::{
pub use self::retained_traits::{
DefaultRetained as DefaultId, RetainedFromIterator as IdFromIterator,
RetainedIntoIterator as IdIntoIterator,
};
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "test_msg_send_id"
name = "test_msg_send_retained"
version = "0.1.0"
edition.workspace = true
publish = false
Expand Down
Loading

0 comments on commit f8b11ac

Please sign in to comment.