Refactor alloc/sync.rs into separate files#81269
Refactor alloc/sync.rs into separate files#81269yoshuawuyts wants to merge 1 commit intorust-lang:masterfrom yoshuawuyts:refactor-alloc-sync
alloc/sync.rs into separate files#81269Conversation
|
r? @cramertj (rust-highfive has picked a reviewer for you, use r? to override) |
|
r? @Mark-Simulacrum probably |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
Updated with @KodrAus's feedback! |
This comment has been minimized.
This comment has been minimized.
|
@bors r+ rollup=never (perf effects?) p=1 |
|
📌 Commit 334b59d7f2e0161e5d33509e8b965fd437332d63 has been approved by |
|
⌛ Testing commit 334b59d7f2e0161e5d33509e8b965fd437332d63 with merge a1fcb93809239ed67d15fae946eb9b46aed77e2e... |
This comment has been minimized.
This comment has been minimized.
|
💔 Test failed - checks-actions |
|
I've fixed the merge conflict and pushed. I'm not sure what cause the failure on CI before. Does anyone have a clue what could be the cause? Or perhaps how to repro this locally so I can figure out what the failure is? |
This comment has been minimized.
This comment has been minimized.
|
☔ The latest upstream changes (presumably #82053) made this pull request unmergeable. Please resolve the merge conflicts. |
- `alloc::sync::Arc` now lives in `libraries/alloc/sync/arc.rs` - `alloc::sync::Weak` now lives in `libraries/alloc/sync/weak.rs` - tests now live in `alloc/tests/arc.rs`
|
CI now passes again. cc/ @KodrAus I think this is ready to be merged by bors |
|
@bors r+ |
|
📌 Commit d7fa04c has been approved by |
|
⌛ Testing commit d7fa04c with merge f92147b9be3270f580667eac6f7fa578c39843dd... |
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
💔 Test failed - checks-actions |
|
It looks like a clippy test is currently failing here, so marking as waiting-on-author. |
|
@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 (: |
I've recently done some work on
Arc, and found it difficult to work with the 2000 odd linealloc/sync.rsfile. This patch splitsalloc/sync.rsinto a submodule, trackingArcandWeakin separate files making it easier to work on the individual types. Thanks!Changes:
alloc::sync::Arcnow lives inlibraries/alloc/sync/arc.rsalloc::sync::Weaknow lives inlibraries/alloc/sync/weak.rsalloc/tests/arc.rsRc is taken care of in #81272.