Don't inherit Send from parking_lot::*Guard #4359
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Darksonn
force-pushed
the
parking_lot_send_guard
branch
from
739c02b to
993dc5e
Compare
hawkw
approved these changes
Dec 30, 2021
tokio/src/loom/std/parking_lot.rs
Outdated
Comment on lines
15
to
18
| pub(crate) struct Mutex<T: ?Sized>(PhantomData<std::sync::Mutex<T>>, parking_lot::Mutex<T>); | ||
|
|
||
| #[derive(Debug)] | ||
| pub(crate) struct RwLock<T>(parking_lot::RwLock<T>); | ||
| pub(crate) struct RwLock<T>(PhantomData<std::sync::RwLock<T>>, parking_lot::RwLock<T>); |
There was a problem hiding this comment.
i have a slight preference for either making these named fields, or breaking them across multiple lines like we do with the guard types...this feels like a lot for one line. not a blocker though.
jonhoo
approved these changes
Dec 30, 2021
Noah-Kennedy
approved these changes
Dec 31, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently our
tokio::sync::watch::Reftype can becomeSendif Tokio is compiled with theparking_lotfeature andparking_lotis compiled with itssend_guardfeature. This PR will prevent thesend_guardfeature from affecting whether Tokio types areSendor not.Strictly speaking, this PR is a breaking change, however I believe we should make the change regardless. As it stands now, the
parking_lotcrate is in our public API, and if don't want to make this change, then we should also commit to never upgradingparking_lotbeyond0.11.x, as such an upgrade would be also be a breaking change for the same reasons.I don't think many people will be affected by this. Anyone who is affected is probably holding a
tokio::sync::watch::Refalive across an.await, which is always incorrect.The first commit in this PR adds a test to CI that should catch this in the future. The commit is first so we can see the test fail without the change. The test relies on
tokio/tokio/tests/async_send_sync.rs.