Skip to content

Oneshot should hold the inner #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2022
Merged

Oneshot should hold the inner #222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions crates/rust-wasm/src/futures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::cell::RefCell;
use std::future::Future;
use std::mem;
use std::pin::Pin;
use std::rc::{Rc, Weak};
use std::rc::Rc;
use std::sync::Arc;
use std::task::*;

Expand Down Expand Up @@ -110,7 +110,7 @@ impl Wake for PollingWaker {
}

pub struct Oneshot<T> {
inner: Weak<OneshotInner<T>>,
inner: Rc<OneshotInner<T>>,
}

pub struct Sender<T> {
Expand All @@ -135,7 +135,7 @@ impl<T> Oneshot<T> {
});
(
Oneshot {
inner: Rc::downgrade(&inner),
inner: Rc::clone(&inner),
},
Sender { inner },
)
Expand All @@ -146,13 +146,7 @@ impl<T> Future for Oneshot<T> {
type Output = T;

fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<T> {
let inner = match self.inner.upgrade() {
Some(inner) => inner,
// Technically this isn't possible in the initial draft of interface
// types unless there's some serious bug somewhere.
None => panic!("completion callback was canceled"),
};
let mut state = inner.state.borrow_mut();
let mut state = self.inner.state.borrow_mut();
match mem::replace(&mut *state, OneshotState::Start) {
OneshotState::Done(t) => Poll::Ready(t),
OneshotState::Waiting(_) | OneshotState::Start => {
Expand Down