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

Reuse modules on hermit #84521

Merged
merged 1 commit into from
Apr 27, 2021
Merged

Reuse modules on hermit #84521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 0 additions & 47 deletions library/std/src/sys/hermit/io.rs
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions library/std/src/sys/hermit/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ pub mod env;
pub mod ext;
pub mod fd;
pub mod fs;
#[path = "../unsupported/io.rs"]
pub mod io;
pub mod memchr;
pub mod mutex;
pub mod net;
pub mod os;
#[path = "../unix/path.rs"]
Copy link
Member

Choose a reason for hiding this comment

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

Hm, I'm a bit worried that in theory people changing the unix path.rs will not expect it to also get picked up on other platforms. It does seem pretty unlikely to get changed, but maybe we can at least add a comment to that file that it's also used by other platforms?

pub mod path;
#[path = "../unsupported/pipe.rs"]
pub mod pipe;
Expand All @@ -41,6 +43,7 @@ pub mod stack_overflow;
pub mod stdio;
pub mod thread;
pub mod thread_local_dtor;
#[path = "../unsupported/thread_local_key.rs"]
pub mod thread_local_key;
pub mod time;

Expand Down
19 changes: 0 additions & 19 deletions library/std/src/sys/hermit/path.rs
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions library/std/src/sys/hermit/thread_local_key.rs
View file
Open in desktop

This file was deleted.