Add a `try_clone()` function to `OwnedFd`.#88794

sunfishcode · 2021-09-09T21:17:18Z

As suggested in #88564. This adds a try_clone() to OwnedFd by
refactoring the code out of the existing File/Socket code.

r? @joshtriplett

As suggested in rust-lang#88564. This adds a `try_clone()` to `OwnedFd` by refactoring the code out of the existing `File`/`Socket` code.

joshtriplett · 2021-09-09T21:46:57Z

library/std/src/sys/unix/fd.rs

    }

+    #[inline]
    pub fn duplicate(&self) -> io::Result<FileDesc> {


Long-term, I wonder if we can eliminate this internal interface in favor of try_clone. But that's not an issue for this PR.

joshtriplett · 2021-09-09T21:47:06Z

LGTM. r=me when CI passes.

sunfishcode · 2021-09-30T23:46:13Z

The CI now passes; @joshtriplett I think this just needs an r+.

joshtriplett · 2021-10-04T02:58:34Z

LGTM

@bors r+

As a follow-up, I think we should investigate whether we can drop the special-case handling of systems without F_DUPFD_CLOEXEC. (In particular, I'm wondering if the platform could instead automatically handle F_DUPFD_CLOEXEC and translate it to F_DUPFD, or alternatively if we should export the flag from libc as an alias for compatibility.)

bors · 2021-10-04T02:58:35Z

📌 Commit 2d6a4c8 has been approved by joshtriplett

…r=joshtriplett Add a `try_clone()` function to `OwnedFd`. As suggested in rust-lang#88564. This adds a `try_clone()` to `OwnedFd` by refactoring the code out of the existing `File`/`Socket` code. r? `@joshtriplett`

Manishearth · 2021-10-04T20:30:49Z

@bors r-

#89525 (comment)

sunfishcode · 2021-10-05T21:18:47Z

The compilation errors on WASI are now fixed.

sunfishcode · 2021-10-12T12:18:40Z

@joshtriplett This previously had a compilation error on WASI, which is now fixed.

sunfishcode · 2021-10-15T16:54:06Z

I've now fixed the error reported by bors.

r? @joshtriplett

…r=joshtriplett Add a `try_clone()` function to `OwnedFd`. As suggested in rust-lang#88564. This adds a `try_clone()` to `OwnedFd` by refactoring the code out of the existing `File`/`Socket` code. r? ``@joshtriplett``

matthiaskrgr · 2021-12-11T16:33:30Z

@bors r-
failed in a rollup: #91790 (comment)

`WSADuplicateSocketW` returns 0 on success, which differs from handle-oriented functions which return 0 on error. Use `sys::net::cvt` to handle its return value, which handles the socket convention of returning 0 on success, rather than `sys::cvt`, which handles the handle-oriented convention of returning 0 on failure.

sunfishcode · 2022-01-12T20:58:56Z

The CI failure turned out to be that the code was calling cvt, and when it was moved to a different file, it silently started calling a different cvt. On Windows, one cvt treats 0 as indicating a failure, while the other cvt treats 0 as indicating success.

r? @joshtriplett

joshtriplett · 2022-01-24T20:09:30Z

@sunfishcode Good catch. That seems like a source of potential future bugs. Would you consider a separate PR to rename the socket-like one to cvt_socket or similar, to make the behavior difference more obvious?

@bors r+

bors · 2022-01-24T20:09:32Z

📌 Commit 83aebf8 has been approved by joshtriplett

…r=joshtriplett Add a `try_clone()` function to `OwnedFd`. As suggested in rust-lang#88564. This adds a `try_clone()` to `OwnedFd` by refactoring the code out of the existing `File`/`Socket` code. r? `@joshtriplett`

…askrgr Rollup of 8 pull requests Successful merges: - rust-lang#88794 (Add a `try_clone()` function to `OwnedFd`.) - rust-lang#93064 (Properly track `DepNode`s in trait evaluation provisional cache) - rust-lang#93118 (Move param count error emission to end of `check_argument_types`) - rust-lang#93144 (Work around missing code coverage data causing llvm-cov failures) - rust-lang#93169 (Fix inconsistency of local blanket impls) - rust-lang#93175 (Implement stable overlap check considering negative traits) - rust-lang#93251 (rustdoc settings: use radio buttons for theme) - rust-lang#93269 (Use error-on-mismatch policy for PAuth module flags.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

Port std's `try_clone`, added in rust-lang/rust#88794, to io-lifetimes. This puts the actua clone logic under control of `feature = "close"`, as it has a similar circular dependency issue with rustix.

This corresponds to the `try_clone` function in sunfishcode/io-lifetimes#16 and rust-lang/rust#88794.

Port std's `try_clone`, added in rust-lang/rust#88794, to io-lifetimes. This puts the actua clone logic under control of `feature = "close"`, as it has a similar circular dependency issue with rustix.

This corresponds to the `try_clone` function in sunfishcode/io-lifetimes#16 and rust-lang/rust#88794.

Add a try_clone() function to OwnedFd.

18c14ad

As suggested in rust-lang#88564. This adds a `try_clone()` to `OwnedFd` by refactoring the code out of the existing `File`/`Socket` code.

rust-highfive assigned joshtriplett Sep 9, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 9, 2021

This comment has been minimized.

Sign in to view

Fix Windows compilation errors.

622dfcc

joshtriplett reviewed Sep 9, 2021

View reviewed changes

sunfishcode mentioned this pull request Sep 9, 2021

BorrowedFd::to_owned() gives you another BorrowedFd #88564

Closed

This comment has been minimized.

Sign in to view

sunfishcode added 2 commits September 9, 2021 15:30

Fix more Windows compilation errors.

c986c6b

Fix another Windows compilation error.

2d6a4c8

JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 28, 2021

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 Oct 4, 2021

Manishearth mentioned this pull request Oct 4, 2021

Rollup of 14 pull requests #89525

Closed

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 Oct 4, 2021

Fix compilation on WASI, which doesn't yet support dup.

53e072f

apiraino added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Oct 14, 2021

sunfishcode removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 15, 2021

matthiaskrgr mentioned this pull request Dec 11, 2021

Rollup of 6 pull requests #91790

Closed

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 Dec 11, 2021

sunfishcode added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 12, 2022

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 Jan 24, 2022

This was referenced Jan 25, 2022

Rollup of 8 pull requests #93287

Closed

Rollup of 8 pull requests #93288

Merged

bors merged commit 687bb58 into rust-lang:master Jan 25, 2022

rustbot added this to the 1.60.0 milestone Jan 25, 2022

sunfishcode mentioned this pull request Feb 8, 2022

Port try_clone to io-lifetimes. sunfishcode/io-lifetimes#16

Merged

sunfishcode added a commit to bytecodealliance/rustix that referenced this pull request Feb 8, 2022

Add a try_clone method to OwnedFd.

435f29c

This corresponds to the `try_clone` function in sunfishcode/io-lifetimes#16 and rust-lang/rust#88794.

sunfishcode added a commit to bytecodealliance/rustix that referenced this pull request Feb 8, 2022

Add a try_clone method to OwnedFd.

4e1100b

This corresponds to the `try_clone` function in sunfishcode/io-lifetimes#16 and rust-lang/rust#88794.

sunfishcode mentioned this pull request Feb 8, 2022

Add a try_clone method to OwnedFd. bytecodealliance/rustix#218

Merged

sunfishcode added a commit to bytecodealliance/rustix that referenced this pull request Feb 8, 2022

Add a try_clone method to OwnedFd. (#218)

e1563f8

This corresponds to the `try_clone` function in sunfishcode/io-lifetimes#16 and rust-lang/rust#88794.

sunfishcode added a commit to bytecodealliance/rustix that referenced this pull request Feb 10, 2022

Add a try_clone method to OwnedFd. (#218)

0df9402

This corresponds to the `try_clone` function in sunfishcode/io-lifetimes#16 and rust-lang/rust#88794.

o01eg mentioned this pull request Apr 10, 2022

Rustdoc fails to build wasm32 target documentation #76526

Closed

Uh oh!

Conversation

sunfishcode commented Sep 9, 2021

Uh oh!

This comment has been minimized.

joshtriplett Sep 9, 2021

Choose a reason for hiding this comment

Uh oh!

joshtriplett commented Sep 9, 2021

Uh oh!

This comment has been minimized.

sunfishcode commented Sep 30, 2021

Uh oh!

joshtriplett commented Oct 4, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Oct 4, 2021

Uh oh!

Manishearth commented Oct 4, 2021

Uh oh!

sunfishcode commented Oct 5, 2021

Uh oh!

sunfishcode commented Oct 12, 2021

Uh oh!

sunfishcode commented Oct 15, 2021

Uh oh!

matthiaskrgr commented Dec 11, 2021

Uh oh!

sunfishcode commented Jan 12, 2022

Uh oh!

joshtriplett commented Jan 24, 2022

Uh oh!

bors commented Jan 24, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

joshtriplett commented Oct 4, 2021 •

edited

Loading