Fixed some compilation errors introduced by #4204 that assume tokio::task::block_in_place() always exists
#4402
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
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.
I noticed that
cargo check --no-default-features --features=sys,wasmer/sysno longer works because #4204 introduced some calls totokio::task::block_in_place()when#[cfg(feature = "sys")], but that function is only available whentokio'srt-multi-threadfeature flag is enabled (enabled by wasix'ssys-threadsfeature).I've updated all places that called
tokio::task::block_in_place()so they go through a shim function that will defer totokio::task::block_in_place()if it is available. This also helped hoist the conditional compilation out of our business logic.