Skip to content

Conversation

m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented May 21, 2022

I wrote state where I should've used s.

This was spotted by @Warrenren.

This change removes the unnecessary s variable to prevent that mistake.

Fortunately, this typo didn't affect the correctness of the lock, as the
second half of the condition (!has_writers_waiting) is enough for
correctness, which explains why this mistake didn't show up during
testing.

Fixes #97162

I wrote `state` where I should've used `s`.

This removes the unnecessary `s` variable to prevent that mistake.

Fortunately, this typo didn't affect the correctness of the lock, as the
second half of the condition (!has_writers_waiting) is enough for
correctness, which explains why this mistake didn't show up during
testing.
@m-ou-se m-ou-se added A-concurrency Area: Concurrency T-libs Relevant to the library team, which will review and decide on the PR/issue. labels May 21, 2022
@rust-highfive

This comment was marked as off-topic.

@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 21, 2022
Copy link
Member

@JohnTitor JohnTitor left a comment

Choose a reason for hiding this comment

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

Looks correct to me!

@JohnTitor
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 22, 2022

📌 Commit 3b70c29 has been approved by JohnTitor

@bors bors 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 May 22, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request May 22, 2022
Rollup of 6 pull requests

Successful merges:

 - rust-lang#97144 (Fix rusty grammar in `std::error::Reporter` docs)
 - rust-lang#97225 (Fix `Display` for `cell::{Ref,RefMut}`)
 - rust-lang#97228 (Omit stdarch workspace from rust-src)
 - rust-lang#97236 (Recover when resolution did not resolve lifetimes.)
 - rust-lang#97245 (Fix typo in futex RwLock::write_contended.)
 - rust-lang#97259 (Fix typo in Mir phase docs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 76725e0 into rust-lang:master May 22, 2022
@rustbot rustbot added this to the 1.63.0 milestone May 22, 2022
@m-ou-se m-ou-se deleted the rwlock-state-typo branch May 22, 2022 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-concurrency Area: Concurrency S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unix Rwlock write_contended code issue
6 participants