Move all `sys::ext` modules to `os` #84200

CDirkx · 2021-04-14T20:38:20Z

This PR moves all sys::ext modules to os, centralizing the location of all os code and simplifying the dependencies between os and sys.

Because this also removes all uses cfg_if! on publicly exported items, where after #81969 there were still a few left, this should properly work around rust-lang/rust-analyzer#6038.

@rustbot label: +T-libs-impl

rust-highfive · 2021-04-14T20:38:23Z

r? @m-ou-se

(rust-highfive has picked a reviewer for you, use r? to override)

CDirkx · 2021-04-14T20:40:38Z

library/std/src/os/mod.rs

+#[cfg(not(doc))]
+#[stable(feature = "os", since = "1.0.0")]
+pub use imp::*;


The stability attributes on these re-exports don't affect the stability of the exported items.

CDirkx · 2021-04-14T22:31:23Z

Not really sure about the error, building for x86_64-unknown-linux-gnu works for me locally.

m-ou-se · 2021-04-16T12:03:39Z

Not really sure about the error, building for x86_64-unknown-linux-gnu works for me locally.

It only works if the directory library/std/src/os/imp exists, since pub mod linux; is trying to load library/std/src/os/imp/../linux/mod.rs. Git doesn't track empty directories, so you have this directory locally in your working directory, but it's not part of the git tree and doesn't exist after a clean checkout like in CI.

m-ou-se · 2021-04-16T12:08:38Z

(You can add #[path = "."] to the inline modules, and remove all the ../ from the paths.)

CDirkx · 2021-04-18T02:32:44Z

Oh I didn't know that could be done, thanks for the suggestion!

m-ou-se

This took some time to review, mostly because the current code (before this change) is a bit hard to follow, which this PR nicely cleans up. Thanks for doing this!

I only have one question:

m-ou-se · 2021-04-21T12:36:52Z

library/std/src/os/hermit/mod.rs

-#![allow(missing_docs)]
+#![unstable(feature = "hermit_platform", issue = "none")]


Why did this change?

Oh good catch, that is separate change I was working on that should be excluded from this PR.

(I noticed that hermit currently exports its extensions as unix, even though it is not target_os = "unix" and only contains OsStringExt (which might be confusing for users expecting e.g. sys::os::unix::fs::FileExt). I spoke with someone working on Hermit about whether this was intentional; and he said that currently there is no way for hermit to fully replicate everything in os::unix and that the plan is to instead move to os::hermit.)

Excluded 👍🏻

CDirkx · 2021-04-21T13:39:53Z

This took some time to review, mostly because the the current code (before this change) is a bit hard to follow

Fully agreed that the code was hard to follow, it took quite some time untangling it all.
Thanks for all the reviews you have been doing!

m-ou-se

This will fail to merge once your other PR (#84119) is merged into thet main branch, which should happen soon. So I'm waiting with the r+ until the rebase of this one.

bors · 2021-04-22T08:14:09Z

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

CDirkx · 2021-04-22T08:26:06Z

Rebased and resolved the merge conflicts

m-ou-se · 2021-04-22T11:42:02Z

@bors r+ rollup=iffy

bors · 2021-04-22T11:42:04Z

📌 Commit 76e03ac8fdc1b9840e0dc906f9d7c10b2a99bb8e has been approved by m-ou-se

bors · 2021-04-22T15:03:21Z

⌛ Testing commit 76e03ac8fdc1b9840e0dc906f9d7c10b2a99bb8e with merge 694f1b7949b1bb1edb51e84f939aac981ad85326...

bors · 2021-04-22T15:36:23Z

💔 Test failed - checks-actions

bors · 2021-05-03T08:08:44Z

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

…os::imp::unix::fs::PermissionsExt::from_mode` in Clippy

m-ou-se · 2021-05-05T13:04:59Z

Thanks again :)

@bors r+

bors · 2021-05-05T13:05:01Z

📌 Commit 2173d8d has been approved by m-ou-se

bors · 2021-05-05T14:15:23Z

⌛ Testing commit 2173d8d with merge 342db70...

bors · 2021-05-05T16:40:26Z

☀️ Test successful - checks-actions
Approved by: m-ou-se
Pushing 342db70 to master...

Move all `sys::ext` modules to `os` This PR moves all `sys::ext` modules to `os`, centralizing the location of all `os` code and simplifying the dependencies between `os` and `sys`. Because this also removes all uses `cfg_if!` on publicly exported items, where after rust-lang#81969 there were still a few left, this should properly work around rust-lang/rust-analyzer#6038. `@rustbot` label: +T-libs-impl

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

rust-highfive assigned m-ou-se Apr 14, 2021

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

CDirkx commented Apr 14, 2021

View reviewed changes

This comment has been minimized.

Sign in to view

CDirkx force-pushed the os branch from ea98321 to 8ce263a Compare April 18, 2021 02:18

m-ou-se reviewed Apr 21, 2021

View reviewed changes

CDirkx force-pushed the os branch from 8ce263a to 318bc26 Compare April 21, 2021 13:31

m-ou-se approved these changes Apr 21, 2021

View reviewed changes

m-ou-se 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 21, 2021

CDirkx force-pushed the os branch from 318bc26 to 76e03ac Compare April 22, 2021 08:25

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 Apr 22, 2021

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 Apr 22, 2021

CDirkx force-pushed the os branch from b0fcafb to 7c17183 Compare May 1, 2021 16:42

CDirkx added 9 commits May 3, 2021 16:56

Cleanup std::os

0e2cd33

Move std::sys::hermit::ext to std::os::hermit

7024bff

Move std::sys::windows::ext to std::os::windows

ffc20e4

Move std::sys::unix::ext to std::os::unix

a808fd4

Move std::sys::wasi::ext to std::os::wasi

3edba7a

Move std::sys::sgx::ext to std::os::fortanix_sgx

e098d27

Rework os to avoid using cfg_if! with public items

a0ca3f9

Allow documenting on hermit

0caa20e

Change std::sys::unix::ext::fs::PermissionsExt::from_mode to `std::…

2173d8d

…os::imp::unix::fs::PermissionsExt::from_mode` in Clippy

CDirkx force-pushed the os branch from 7c17183 to 2173d8d Compare May 3, 2021 14:57

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 5, 2021

bors added the merged-by-bors This PR was explicitly merged by bors. label May 5, 2021

bors merged commit 342db70 into rust-lang:master May 5, 2021

rustbot added this to the 1.54.0 milestone May 5, 2021

CDirkx deleted the os branch May 5, 2021 18:51

CDirkx mentioned this pull request May 5, 2021

Unresolved import for platform specific modules rust-lang/rust-analyzer#6038

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move all `sys::ext` modules to `os` #84200

Move all `sys::ext` modules to `os` #84200

CDirkx commented Apr 14, 2021 •

edited

rust-highfive commented Apr 14, 2021

CDirkx Apr 14, 2021

This comment has been minimized.

CDirkx commented Apr 14, 2021

m-ou-se commented Apr 16, 2021 •

edited

m-ou-se commented Apr 16, 2021

CDirkx commented Apr 18, 2021

m-ou-se left a comment

m-ou-se Apr 21, 2021

CDirkx Apr 21, 2021 •

edited

CDirkx Apr 21, 2021

CDirkx commented Apr 21, 2021

m-ou-se left a comment

bors commented Apr 22, 2021

CDirkx commented Apr 22, 2021

m-ou-se commented Apr 22, 2021

bors commented Apr 22, 2021

bors commented Apr 22, 2021

This comment has been minimized.

bors commented Apr 22, 2021

bors commented May 3, 2021

m-ou-se commented May 5, 2021

bors commented May 5, 2021

bors commented May 5, 2021

bors commented May 5, 2021

		#![allow(missing_docs)]
		#![unstable(feature = "hermit_platform", issue = "none")]

Move all sys::ext modules to os #84200

Move all sys::ext modules to os #84200

Conversation

CDirkx commented Apr 14, 2021 • edited

rust-highfive commented Apr 14, 2021

CDirkx Apr 14, 2021

Choose a reason for hiding this comment

This comment has been minimized.

CDirkx commented Apr 14, 2021

m-ou-se commented Apr 16, 2021 • edited

m-ou-se commented Apr 16, 2021

CDirkx commented Apr 18, 2021

m-ou-se left a comment

Choose a reason for hiding this comment

m-ou-se Apr 21, 2021

Choose a reason for hiding this comment

CDirkx Apr 21, 2021 • edited

Choose a reason for hiding this comment

CDirkx Apr 21, 2021

Choose a reason for hiding this comment

CDirkx commented Apr 21, 2021

m-ou-se left a comment

Choose a reason for hiding this comment

bors commented Apr 22, 2021

CDirkx commented Apr 22, 2021

m-ou-se commented Apr 22, 2021

bors commented Apr 22, 2021

bors commented Apr 22, 2021

This comment has been minimized.

bors commented Apr 22, 2021

bors commented May 3, 2021

m-ou-se commented May 5, 2021

bors commented May 5, 2021

bors commented May 5, 2021

bors commented May 5, 2021

Move all `sys::ext` modules to `os` #84200

Move all `sys::ext` modules to `os` #84200

CDirkx commented Apr 14, 2021 •

edited

m-ou-se commented Apr 16, 2021 •

edited

CDirkx Apr 21, 2021 •

edited