tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-08-28 00:00:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

sync: fix watch borrow_and_update (#3913)

Browse Source
This commit is contained in:
Alice Ryhl
2021-07-02 10:14:34 -07:00
committed by GitHub
parent 08ed41f339
commit c8ecfc894d
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tokio/src/sync/watch.rs
+1 -1
View File
@@ -247,7 +247,7 @@ impl<T> Receiver<T> {
/// [`changed`]: Receiver::changed /// [`changed`]: Receiver::changed
pub fn borrow_and_update(&mut self) -> Ref<'_, T> { pub fn borrow_and_update(&mut self) -> Ref<'_, T> {
let inner = self.shared.value.read().unwrap(); let inner = self.shared.value.read().unwrap();
self.version = self.shared.version.load(SeqCst); self.version = self.shared.version.load(SeqCst) & !CLOSED;
Ref { inner } Ref { inner }
} }
tokio/tests/sync_watch.rs
+17
View File
@@ -169,3 +169,20 @@ fn poll_close() {
assert!(tx.send("two").is_err()); assert!(tx.send("two").is_err());
} }
#[test]
fn borrow_and_update() {
let (tx, mut rx) = watch::channel("one");
tx.send("two").unwrap();
assert_ready!(spawn(rx.changed()).poll()).unwrap();
assert_pending!(spawn(rx.changed()).poll());
tx.send("three").unwrap();
assert_eq!(*rx.borrow_and_update(), "three");
assert_pending!(spawn(rx.changed()).poll());
drop(tx);
assert_eq!(*rx.borrow_and_update(), "three");
assert_ready!(spawn(rx.changed()).poll()).unwrap_err();
}