Skip to content

cowrcstr: Move owned variant drop out of line. #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emilio merged 1 commit into from
Aug 30, 2026
Merged

cowrcstr: Move owned variant drop out of line. #451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/cow_rc_str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,17 @@ impl Clone for CowRcStr<'_> {
}
}

#[cold]
#[inline(never)]
unsafe fn drop_slow(ptr: *const String) {
mem::drop(Rc::from_raw(ptr))

@mrobinson mrobinson Aug 30, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would surround this with unsafe, to avoid a warning on some versions of Rust.

Suggested change
mem::drop(Rc::from_raw(ptr))
unsafe { mem::drop(Rc::from_raw(ptr)) };

@emilio emilio Aug 30, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gah, sorry, the auto-merge stuff. Will do :(

@emilio emilio Aug 30, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Though IIRC I tested this with nightly and it didn't warn, is it edition dependent or something?

@emilio emilio Aug 30, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Yes: #453)

}

impl Drop for CowRcStr<'_> {
#[inline]
fn drop(&mut self) {
if let Err(ptr) = self.unpack() {
mem::drop(unsafe { Rc::from_raw(ptr) })
unsafe { drop_slow(ptr) }
}
}
}
Expand Down
Loading