Skip to content
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

Jump to bottom

Fix tokio test ICE #3891

Merged
merged 1 commit into from
Sep 17, 2024
Merged

Fix tokio test ICE #3891

merged 1 commit into from
Sep 17, 2024

Conversation

tiif
Copy link
Contributor

@tiif tiif commented Sep 16, 2024

Fixes #3858

It turned out that the issue mentioned here is the exact cause of ICE.
So in this PR, I changed the type of EpollEventInterest::epfd from i32 to WeakFileDescriptionRef.

RalfJung
RalfJung reviewed Sep 16, 2024
View reviewed changes
src/shims/unix/linux/epoll.rs Show resolved Hide resolved
src/shims/unix/linux/epoll.rs Outdated Show resolved Hide resolved
tests/pass-dep/tokio/issue-3858.rs Outdated Show resolved Hide resolved
tests/pass-dep/tokio/issue-3858.rs Outdated Show resolved Hide resolved
@RalfJung RalfJung added the S-waiting-on-author Status: Waiting for the PR author to address review comments label Sep 16, 2024
@tiif
Copy link
Contributor Author

tiif commented Sep 17, 2024

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Waiting for a review to complete and removed S-waiting-on-author Status: Waiting for the PR author to address review comments labels Sep 17, 2024
@RalfJung
Copy link
Member

Looks good, thanks. :)
r=me after squashing.

@bors delegate+

@bors
Copy link
Contributor

bors commented Sep 17, 2024

✌️ @tiif, you can now approve this pull request!

If @RalfJung told you to "r=me" after making some further change, please make that change, then do @bors r=@RalfJung

@tiif
Copy link
Contributor Author

tiif commented Sep 17, 2024

@bors r=@RalfJung

@bors
Copy link
Contributor

bors commented Sep 17, 2024

📌 Commit a690748 has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Sep 17, 2024

⌛ Testing commit a690748 with merge bdab169...

@bors
Copy link
Contributor

bors commented Sep 17, 2024

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing bdab169 to master...

@bors bors merged commit bdab169 into rust-lang:master Sep 17, 2024
8 checks passed
@tiif tiif deleted the tokiotest branch September 17, 2024 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RalfJung RalfJung RalfJung left review comments

Assignees
No one assigned
Labels
S-waiting-on-review Status: Waiting for a review to complete
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

epoll ICE on tokio test
4 participants
@tiif @RalfJung @bors @rustbot