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

Refactor return_read_bytes_and_count and return_written_byte_count_or_error #3923

Merged
merged 1 commit into from
Oct 1, 2024
Merged

Refactor return_read_bytes_and_count and return_written_byte_count_or_error #3923

merged 1 commit into from
Oct 1, 2024

Conversation

tiif
Copy link
Contributor

@tiif tiif commented Sep 28, 2024 •
edited
Loading

Fixes #3904

This PR

  • separate the error logic from return_read_bytes_and_count and return_written_byte_count_or_error into a helper function set_last_error_and_return.

@tiif tiif changed the title Refactor fd.rs Refactor return_read_bytes_and_count and return_written_byte_count_or_error Sep 28, 2024
@tiif
Copy link
Contributor Author

tiif commented Sep 28, 2024

@rustbot ready

@rustbot rustbot added the S-waiting-on-review Status: Waiting for a review to complete label Sep 28, 2024
RalfJung
RalfJung reviewed Sep 29, 2024
View reviewed changes
Copy link
Member

@RalfJung RalfJung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR!

src/shims/unix/fd.rs Outdated Show resolved Hide resolved
src/helpers.rs Outdated Show resolved Hide resolved
src/shims/unix/fd.rs Outdated Show resolved Hide resolved
src/helpers.rs Outdated Show resolved Hide resolved
src/shims/unix/linux/eventfd.rs Outdated Show resolved Hide resolved
@bors
Copy link
Contributor

bors commented Sep 29, 2024

☔ The latest upstream changes (presumably #3927) made this pull request unmergeable. Please resolve the merge conflicts.

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

tiif commented Sep 30, 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 30, 2024
@RalfJung
Copy link
Member

This looks great, thanks. :)
Please squash the commits.

@oli-obk
Copy link
Contributor

oli-obk commented Oct 1, 2024

@bors r=RalfJung

@bors
Copy link
Contributor

bors commented Oct 1, 2024

📌 Commit 672aba0 has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Oct 1, 2024

⌛ Testing commit 672aba0 with merge 811635a...

@bors
Copy link
Contributor

bors commented Oct 1, 2024

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

@bors bors merged commit 811635a into rust-lang:master Oct 1, 2024
8 checks passed
@bors bors mentioned this pull request Oct 1, 2024
Draft
@RalfJung RalfJung mentioned this pull request Oct 1, 2024
Closed
@tiif tiif deleted the refactor branch October 1, 2024 13:00
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.

Refactor fd.rs return_read_bytes_and_count and return_written_byte_count_or_error
5 participants
@tiif @bors @RalfJung @oli-obk @rustbot