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

Consolidate some duplicate code in the sys modules. #75749

Merged
merged 3 commits into from
Sep 16, 2020
Merged

Consolidate some duplicate code in the sys modules. #75749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a4098e
Consolidate byte-identical modules.
ehuss Aug 20, 2020
cfb955d
Consolidate wasi alloc with unix alloc.
ehuss Aug 20, 2020
25cca07
Consolidate wasi::process and unsupported::process
ehuss Aug 20, 2020
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
308 changes: 0 additions & 308 deletions library/std/src/sys/sgx/fs.rs
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions library/std/src/sys/sgx/io.rs
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions library/std/src/sys/sgx/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,18 @@ pub mod condvar;
pub mod env;
pub mod ext;
pub mod fd;
#[path = "../unsupported/fs.rs"]
pub mod fs;
#[path = "../unsupported/io.rs"]
pub mod io;
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems a little strange to pull the IoSlice types from somewhere with “unsupported” in the name, as these types are actually used and supported on this target.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yea, good point. I can't think of a good place to put this module, since there isn't a location for "basic implementation that is not Unix". Would it make sense to add a sys::basic module that contained code like this? The only other "functional" code in the unsupported tree is:

  • cmath.rs (basic definitions from compiler-builtins)
  • common.rs strlen (very simple pure-rust C-strlen implementation)

pub mod memchr;
pub mod mutex;
pub mod net;
pub mod os;
pub mod path;
#[path = "../unsupported/pipe.rs"]
pub mod pipe;
#[path = "../unsupported/process.rs"]
pub mod process;
pub mod rwlock;
pub mod stack_overflow;
Expand Down
Loading