RUST-995 Add tokio-sync feature flag
#578
Conversation
isabelatkinson
force-pushed
the
RUST-995
branch
from
474baed to
d7e38e4
Compare
src/runtime/mod.rs
Outdated
| /// | ||
| /// This will panic if called from a sychronous context when tokio is being used. | ||
| #[cfg(any(feature = "sync", test))] | ||
| #[cfg(test)] | ||
| pub(crate) fn block_on<F, T>(self, fut: F) -> T |
There was a problem hiding this comment.
This method is now just used for configuring a fail point -- the sync code now calls block_on directly on the static tokio runtime. It's possible we'll want to reconfigure this method but that can be done with a broader refactor in RUST-800.
src/runtime/mod.rs
Outdated
| TokioCallingContext::Sync => None, | ||
| }, | ||
| Self::Tokio => { | ||
| let handle = tokio::runtime::Handle::current(); |
There was a problem hiding this comment.
We can call current directly because there should always be a tokio runtime going (either from the async caller or TOKIO_RUNTIME). We can assume TOKIO_RUNTIME has already been initialized here because the entry point for the execution of any async code is by calling TOKIO_RUNTIME.block_on.
There was a problem hiding this comment.
I think that means the signature of this function can be changed to drop the Option wrapper for the return type entirely.
src/runtime/mod.rs
Outdated
| TokioCallingContext::Sync => None, | ||
| }, | ||
| Self::Tokio => { | ||
| let handle = tokio::runtime::Handle::current(); |
There was a problem hiding this comment.
I think that means the signature of this function can be changed to drop the Option wrapper for the return type entirely.
.evergreen/check-rustdoc.sh
Outdated
| @@ -5,4 +5,5 @@ set -o errexit | |||
| . ~/.cargo/env | |||
| cargo +nightly rustdoc -- -D warnings --cfg docsrs | |||
| cargo +nightly rustdoc --no-default-features --features async-std-runtime -- -D warnings --cfg docsrs | |||
| cargo +nightly rustdoc --no-default-features --features sync -- -D warnings --cfg docsrs | |||
| cargo +nightly rustdoc --features sync -- -D warnings --cfg docsrs | |||
There was a problem hiding this comment.
I think we still need --no-default-features here for the async-std sync variant. It looks like the check-rustdoc.sh test is failing as a result.
There was a problem hiding this comment.
oh whoops, good catch
isabelatkinson
changed the title
tokio-sync feature flag
No description provided.