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

switch to the default implementation of write_vectored #125333

Merged
merged 2 commits into from
May 21, 2024
Merged

switch to the default implementation of write_vectored #125333

merged 2 commits into from
May 21, 2024

Conversation

stlankes
Copy link
Contributor

HermitOS doesn't support write_vectored and switch to the default implementation of write_vectored.

@rustbot
Copy link
Collaborator

rustbot commented May 20, 2024

r? @workingjubilee

rustbot has assigned @workingjubilee.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added O-hermit Operating System: Hermit S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels May 20, 2024
workingjubilee
workingjubilee reviewed May 20, 2024
View reviewed changes
library/std/src/sys/pal/hermit/net.rs
}

Ok(size.try_into().unwrap())
crate::io::default_write_vectored(|b| self.write(b), bufs)
Copy link
Member

Choose a reason for hiding this comment

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

huh, this appears to be the exact same implementation as what's on the left. weird.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, but is_write_vectored was wrong.

Copy link
Member

Choose a reason for hiding this comment

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

yep!

Copy link
Contributor

Choose a reason for hiding this comment

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

You could probably just delete the implementation altogether, it'll fall back to the default automatically.

Copy link
Member

@workingjubilee workingjubilee May 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

This is the impl of Socket, tho, innit?

Or do you mean that the write_vectored calls will resolve to the trait and then dispatch to that one's default impl?

Copy link
Contributor

Choose a reason for hiding this comment

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

This is the impl of Socket, tho, innit?

Oh yeah. Nevermind my comment then, didn't notice.

@workingjubilee
Copy link
Member

lgtm
@bors r+

@bors
Copy link
Contributor

bors commented May 20, 2024

📌 Commit c170bf9 has been approved by workingjubilee

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 20, 2024
@workingjubilee
Copy link
Member

@bors rollup

@workingjubilee
Copy link
Member

Wait.

@bors r-

@stlankes I think the read_vectored implementation is also wrong in the same way, looking at it.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 20, 2024
@stlankes
Copy link
Contributor Author

stlankes commented May 20, 2024 •
edited
Loading

Wait.

@bors r-

@stlankes I think the read_vectored implementation is also wrong in the same way, looking at it.

Good point! I overlooked it.

@workingjubilee
Copy link
Member

Nice, okay!
@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 20, 2024

📌 Commit d39dc0a has been approved by workingjubilee

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 20, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request May 20, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 21, 2024
@bors
Auto merge of rust-lang#125349 - matthiaskrgr:rollup-p2mbdxi, r=matth…
8e7517d 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#124050 (Remove libc from MSVC targets)
 - rust-lang#124283 (Note for E0599 if shadowed bindings has the method.)
 - rust-lang#125123 (Fix `read_exact` and `read_buf_exact` for `&[u8]` and `io:Cursor`)
 - rust-lang#125158 (hir pretty: fix block indent)
 - rust-lang#125308 (track cycle participants per root)
 - rust-lang#125332 (Update books)
 - rust-lang#125333 (switch to the default implementation of `write_vectored`)
 - rust-lang#125346 (Remove some `Path::to_str` from `rustc_codegen_llvm`)

Failed merges:

 - rust-lang#125310 (Move ~100 tests from tests/ui to subdirs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 73bb47e into rust-lang:master May 21, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 21, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 21, 2024
@rust-timer
Unrolled build for rust-lang#125333
7dffa17 
Rollup merge of rust-lang#125333 - hermit-os:fuse, r=workingjubilee

switch to the default implementation of `write_vectored`

HermitOS doesn't support write_vectored and switch to the default implementation of `write_vectored`.
@stlankes stlankes deleted the fuse branch May 21, 2024 06:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@workingjubilee workingjubilee workingjubilee left review comments

@tbu- tbu- tbu- left review comments

Assignees

@workingjubilee workingjubilee

Labels
O-hermit Operating System: Hermit S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.
5 participants
@stlankes @rustbot @workingjubilee @bors @tbu-