Skip to content

Simpilfy thread::JoinInner. - #92553

Merged
bors merged 1 commit into
rust-lang:masterfrom
m-ou-se:thread-join-simplify
Jan 13, 2022
Merged

Simpilfy thread::JoinInner.#92553
bors merged 1 commit into
rust-lang:masterfrom
m-ou-se:thread-join-simplify

Conversation

@m-ou-se

@m-ou-sem-ou-se commented Jan 4, 2022

Copy link
Copy Markdown
Member

JoinInner's native field was an Option, but that's unnecessary.

Also, thanks to Arc::get_mut, there's no unsafety needed in JoinInner::join().

@m-ou-sem-ou-se added A-runtime Area: std's runtime and "pre-main" init for handling backtraces, unwinds, stack overflows C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jan 4, 2022
@rust-highfive

rust-highfive commented Jan 4, 2022

Copy link
Copy Markdown
Contributor

r? @kennytm

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 4, 2022
@Mark-Simulacrum

Mark-Simulacrum commented Jan 4, 2022•
edited
Loading

Copy link
Copy Markdown
Member

FWIW it feels like naively the packet might be better represented as Arc<SyncOnceCell<Result<T>>>, but this PR seems good to me. (At the cost of an extra Once field).

@bors r+

@bors

bors commented Jan 4, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit a45b3ac has been approved by Mark-Simulacrum

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 4, 2022
@m-ou-se

m-ou-se commented Jan 4, 2022

Copy link
Copy Markdown
MemberAuthor

I'll be replacing Packet in the implementation for rust-lang/rfcs#3151. This was just a small clean-up to make that change slightly easier.

@matthiaskrgr

matthiaskrgr commented Jan 4, 2022

Copy link
Copy Markdown
Member

@bors rollup=never (might affect perf, just in case)

@bors

bors commented Jan 13, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a45b3ac with merge 256721e...

@bors

bors commented Jan 13, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 256721e to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jan 13, 2022
@bors
bors merged commit 256721e into rust-lang:masterJan 13, 2022
@rustbotrustbot added this to the 1.60.0 milestone Jan 13, 2022
@rust-timer

rust-timer commented Jan 13, 2022

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (256721e): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@m-ou-se
m-ou-se deleted the thread-join-simplify branch January 13, 2022 13:21
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@kennytmkennytm

Labels

A-runtimeArea: std's runtime and "pre-main" init for handling backtraces, unwinds, stack overflowsC-cleanupCategory: PRs that clean code up or issues documenting cleanup.merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.60.0

Development

Successfully merging this pull request may close these issues.

8 participants

@m-ou-se@rust-highfive@Mark-Simulacrum@bors@matthiaskrgr@rust-timer@kennytm@rustbot