Move `fd` into `std::sys` by thaliaarchi · Pull Request #139092 · rust-lang/rust

thaliaarchi · 2025-03-29T01:39:50Z

Move platform definitions of fd into std::sys, as part of #117276.

Unlike other modules directly under std::sys, this is only available on some platforms and I have not provided a fallback abstraction for unsupported platforms. That is similar to how std::os::fd is gated to only supported platforms.

Also, fix the unsafe_op_in_unsafe_fn lint, which was allowed for the Unix fd impl. Since macro expansions from std::sys::pal::unix::weak trigger this lint, fix it there too.

cc @joboet, @ChrisDenton

try-job: x86_64-gnu-aux

rustbot · 2025-03-29T01:39:55Z

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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

joboet · 2025-03-29T11:20:51Z

It'd be best left to another PR, but I think we could even move the Windows Handle code in this module and rename FileDesc to something like Object.

joboet · 2025-03-29T11:26:24Z

Great, thank you!
r=me once #138988 has merged.

@bors delegate+

bors · 2025-03-29T11:26:27Z

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

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

bors · 2025-03-29T17:55:28Z

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

thaliaarchi · 2025-03-29T21:03:56Z

@bors r=@joboet

bors · 2025-03-29T21:03:59Z

📌 Commit 41d6fbf has been approved by joboet

It is now in the queue for this repository.

Move `fd` into `std::sys` Move platform definitions of `fd` into `std::sys`, as part of rust-lang#117276. Unlike other modules directly under `std::sys`, this is only available on some platforms and I have not provided a fallback abstraction for unsupported platforms. That is similar to how `std::os::fd` is gated to only supported platforms. Also, fix the `unsafe_op_in_unsafe_fn` lint, which was allowed for the Unix fd impl. Since macro expansions from `std::sys::pal::unix::weak` trigger this lint, fix it there too. cc `@joboet,` `@ChrisDenton`

Rollup of 5 pull requests Successful merges: - rust-lang#137836 (Set `target_vendor = "openwrt"` on `mips64-openwrt-linux-musl`) - rust-lang#138206 ([AIX] Ignore linting on repr(C) structs with repr(packed) or repr(align(n))) - rust-lang#139044 (bootstrap: Avoid cloning `change-id` list) - rust-lang#139092 (Move `fd` into `std::sys`) - rust-lang#139111 (Properly document FakeReads) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2025-03-30T07:02:08Z

⌛ Testing commit 41d6fbf with merge b15da48...

Move `fd` into `std::sys` Move platform definitions of `fd` into `std::sys`, as part of rust-lang#117276. Unlike other modules directly under `std::sys`, this is only available on some platforms and I have not provided a fallback abstraction for unsupported platforms. That is similar to how `std::os::fd` is gated to only supported platforms. Also, fix the `unsafe_op_in_unsafe_fn` lint, which was allowed for the Unix fd impl. Since macro expansions from `std::sys::pal::unix::weak` trigger this lint, fix it there too. cc `@joboet,` `@ChrisDenton`

bors · 2025-03-30T08:32:19Z

💔 Test failed - checks-actions

thaliaarchi · 2025-03-30T09:20:40Z

The fix for the CI error is not obvious to me. Miri indeed does not implement readv or writev, but I would have expected an error from that to have been noticed much sooner than now. I didn’t modify any miri gates. Perhaps Miri hardcodes some pal paths?

jieyouxu · 2025-03-30T12:08:20Z

cc @RalfJung

RalfJung · 2025-03-30T18:29:22Z

Yeah, we skip the pal tests here:

rust/src/bootstrap/mk/Makefile.in

Lines 72 to 81 in fb04372

    
           $(Q)MIRIFLAGS="-Zmiri-disable-isolation" \ 
        
           	$(BOOTSTRAP) miri --stage 2 library/std \ 
        
           	$(BOOTSTRAP_ARGS) \ 
        
           	--no-doc -- \ 
        
           	--skip fs:: --skip net:: --skip process:: --skip sys::pal:: 
        
           $(Q)MIRIFLAGS="-Zmiri-disable-isolation" \ 
        
           	$(BOOTSTRAP) miri --stage 2 library/std \ 
        
           	$(BOOTSTRAP_ARGS) \ 
        
           	--doc -- \ 
        
           	--skip fs:: --skip net:: --skip process:: --skip sys::pal::

So we'll need to come up with a new pattern for this. We already list fs::, maybe just add fd::?

thaliaarchi · 2025-04-05T03:23:32Z

Thanks for the fix, Ralf. I've pushed an update for that and added the failed job as a try-job. Can we do a try run?

Zalathar · 2025-04-05T03:31:47Z

@bors try

Move `fd` into `std::sys` Move platform definitions of `fd` into `std::sys`, as part of rust-lang#117276. Unlike other modules directly under `std::sys`, this is only available on some platforms and I have not provided a fallback abstraction for unsupported platforms. That is similar to how `std::os::fd` is gated to only supported platforms. Also, fix the `unsafe_op_in_unsafe_fn` lint, which was allowed for the Unix fd impl. Since macro expansions from `std::sys::pal::unix::weak` trigger this lint, fix it there too. cc `@joboet,` `@ChrisDenton` try-job: x86_64-gnu-aux

bors · 2025-04-05T03:33:00Z

⌛ Trying commit 3ab22fa with merge 45c5651...

bors · 2025-04-05T05:19:47Z

☀️ Try build successful - checks-actions
Build commit: 45c5651 (45c56513e043b1584b826d846c962eaf3f70c3e9)

thaliaarchi · 2025-04-05T05:21:29Z

@bors r=joboet

bors · 2025-04-05T05:21:31Z

📌 Commit 3ab22fa has been approved by joboet

It is now in the queue for this repository.

…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#138368 (KCFI: Add KCFI arity indicator support) - rust-lang#138381 (Implement `SliceIndex` for `ByteStr`) - rust-lang#139092 (Move `fd` into `std::sys`) - rust-lang#139398 (Change notifications for Exploit Mitigations PG) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#139092 - thaliaarchi:move-fd-pal, r=joboet Move `fd` into `std::sys` Move platform definitions of `fd` into `std::sys`, as part of rust-lang#117276. Unlike other modules directly under `std::sys`, this is only available on some platforms and I have not provided a fallback abstraction for unsupported platforms. That is similar to how `std::os::fd` is gated to only supported platforms. Also, fix the `unsafe_op_in_unsafe_fn` lint, which was allowed for the Unix fd impl. Since macro expansions from `std::sys::pal::unix::weak` trigger this lint, fix it there too. cc `@joboet,` `@ChrisDenton` try-job: x86_64-gnu-aux

Move `fd` into `std::sys` Move platform definitions of `fd` into `std::sys`, as part of rust-lang#117276. Unlike other modules directly under `std::sys`, this is only available on some platforms and I have not provided a fallback abstraction for unsupported platforms. That is similar to how `std::os::fd` is gated to only supported platforms. Also, fix the `unsafe_op_in_unsafe_fn` lint, which was allowed for the Unix fd impl. Since macro expansions from `std::sys::pal::unix::weak` trigger this lint, fix it there too. cc `@joboet,` `@ChrisDenton` try-job: x86_64-gnu-aux

rustbot assigned Mark-Simulacrum Mar 29, 2025

joboet mentioned this pull request Mar 29, 2025

Tracking Issue for restructuring std::sys #117276

Open

30 tasks

thaliaarchi force-pushed the move-fd-pal branch from 7d71d36 to 41d6fbf Compare March 29, 2025 19:54

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 Mar 29, 2025

jhpratt mentioned this pull request Mar 30, 2025

Rollup of 5 pull requests #139126

Closed

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 30, 2025

thaliaarchi added 2 commits April 4, 2025 20:11

Move fd into sys

4085af0

Fix unsafe_op_in_unsafe_fn for Unix fd and weak

3ab22fa

thaliaarchi force-pushed the move-fd-pal branch from 41d6fbf to 3ab22fa Compare April 5, 2025 03:21

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Apr 5, 2025

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 Apr 5, 2025

matthiaskrgr mentioned this pull request Apr 5, 2025

Rollup of 4 pull requests #139401

Merged

bors merged commit a64ccf4 into rust-lang:master Apr 5, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone Apr 5, 2025

thaliaarchi deleted the move-fd-pal branch April 5, 2025 19:03

Uh oh!

Conversation

thaliaarchi commented Mar 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Mar 29, 2025

Uh oh!

joboet commented Mar 29, 2025

Uh oh!

joboet commented Mar 29, 2025

Uh oh!

bors commented Mar 29, 2025

Uh oh!

bors commented Mar 29, 2025

Uh oh!

thaliaarchi commented Mar 29, 2025

Uh oh!

bors commented Mar 29, 2025

Uh oh!

bors commented Mar 30, 2025

Uh oh!

This comment has been minimized.

bors commented Mar 30, 2025

Uh oh!

thaliaarchi commented Mar 30, 2025

Uh oh!

jieyouxu commented Mar 30, 2025

Uh oh!

RalfJung commented Mar 30, 2025

Uh oh!

thaliaarchi commented Apr 5, 2025

Uh oh!

Zalathar commented Apr 5, 2025

Uh oh!

bors commented Apr 5, 2025

Uh oh!

bors commented Apr 5, 2025

Uh oh!

thaliaarchi commented Apr 5, 2025

Uh oh!

bors commented Apr 5, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

thaliaarchi commented Mar 29, 2025 •

edited

Loading