Refactor alloc/rc.rs into separate files#81272
Refactor alloc/rc.rs into separate files#81272yoshuawuyts wants to merge 1 commit intorust-lang:masterfrom yoshuawuyts:refactor-alloc-rc
alloc/rc.rs into separate files#81272Conversation
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
Fixed the merge conflict. If CI passes, I would appreciate a review on this. This is a rather large refactor, and keeping it up to date week over week can be challenging. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
Thanks for working on this @yoshuawuyts! It looks like we've got a |
|
I manually mapped the diff back into the original |
|
@bors r+ Optimistically. I'll check back in here if the build fails. |
|
📌 Commit 25c79f6e1633b4f5c32897e738cf59d9bffe3383 has been approved by |
|
@bors rollup=never These are frequently perf sensitive, unfortunately. |
|
⌛ Testing commit 25c79f6e1633b4f5c32897e738cf59d9bffe3383 with merge ffd1d01aba565e49ff9fea164d09310258468286... |
This comment has been minimized.
This comment has been minimized.
|
💔 Test failed - checks-actions |
|
@bors try |
|
⌛ Trying commit f827af42634db2e00b37c6f5f26f662c14787b76 with merge 21fef35f54cf849c200204fae70a193547de1b93... |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
💔 Test failed - checks-actions |
|
☔ The latest upstream changes (presumably #82053) made this pull request unmergeable. Please resolve the merge conflicts. |
|
It looks like we've run into a few more merge conflicts. Sorry for the pain here @yoshuawuyts! Maybe what we could do here is either:
|
|
@KodrAus picking a time would have my preference. Let's chat on Zulip? |
- `alloc::rc::Rc` now lives in `libraries/alloc/rc/rc.rs` - `alloc::rc::Weak` now lives in `libraries/alloc/rc/weak.rs` - the majority of tests now live in `alloc/tests/arc.rs` - one test which tests internals is in `alloc/rc/rc.rs` Other changes: - Remove trailing newline - Remove unused re-exports - Fix rc re-exports Co-Authored-By: Ashley Mannix <kodraus@hey.com>
|
@bors r+ |
|
📌 Commit 65bbb3d has been approved by |
|
⌛ Testing commit 65bbb3d with merge 661c87708b69bd03ed3a1a31adbcba2c9032fbb4... |
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
💔 Test failed - checks-actions |
|
@bors r- |
|
@yoshuawuyts Ping from triage, it seems CI is still failing here. |
|
☔ The latest upstream changes (presumably #83726) made this pull request unmergeable. Please resolve the merge conflicts. |
|
More patches have been merged since. I'm going to shelve this for now (: |
Similar to #81269, this patch splits
alloc/rc.rsinto a submodule, trackingRcandWeakin separate files making it easier to work on the individual types. Thanks!Changes
alloc::rc::Rcnow lives inlibraries/alloc/rc/rc.rsalloc::rc::Weaknow lives inlibraries/alloc/rc/weak.rsalloc/tests/arc.rsalloc/rc/rc.rsr? @KodrAus @Mark-Simulacrum