Replace async-std with ZRuntime and tokio #937
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
src/scouting.rs
Outdated
| @@ -209,7 +209,8 @@ pub extern "C" fn z_scout( | |||
| }) | |||
| .await | |||
| .unwrap(); | |||
| async_std::task::sleep(std::time::Duration::from_millis(timeout)).await; | |||
|
|
|||
| tokio::time::sleep(std::time::Duration::from_millis(timeout)).await; | |||
| std::mem::drop(scout); | |||
There was a problem hiding this comment.
Do we really need to explicitly drop scout here ?
There was a problem hiding this comment.
I don't think so. Even though it's not meant to be in scope of this PR, I can remove it as part of it if you prefer.
There was a problem hiding this comment.
Yes, I think it is better to remove unneeded code.
There was a problem hiding this comment.
Done, and I've also improve error handling by removing a dangerous unwrap.
DenisBiryukov91
approved these changes
Mar 5, 2025
Mallets
added a commit
that referenced
this pull request
Mar 5, 2025
* Fix clippy warnings * run apt-get update for Cross compile on ubuntu-latest (#938) * build: Sync with eclipse-zenoh/zenoh@f421407 from 2025-03-03 (#934) Co-authored-by: eclipse-zenoh-bot <[email protected]> * cargo fmt * Replace async-std with ZRuntime and tokio (#937) * Replace async-std with ZRuntime and tokio * Improve error handling in z_scout * Fix clippy warnings * cargo fmt --------- Co-authored-by: DenisBiryukov91 <[email protected]> Co-authored-by: eclipse-zenoh-bot <[email protected]> Co-authored-by: eclipse-zenoh-bot <[email protected]>
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.
Zenoh moved to
tokioalready for a quite some time.async-stddependency was still in use in thez_scoutimplementation. This PR removesasync-stddependencies and usesZRuntimeandtokioinstead.