Skip to content

Commit 034af08

Browse files
authored
Rollup merge of #75749 - ehuss:consolidate-sys, r=alexcrichton
Consolidate some duplicate code in the sys modules. This consolidates some modules which were duplicated throughout the sys module. The intent is to make it easier to update and maintain this code. This mainly affects the wasi, sgx, and "unsupported" targets. I explicitly skipped hermit, cloudabi, and vxworks. These tier-3 targets have copied large sections of the sys tree. I don't think they should have, but I don't want to put effort into changing them. It also doesn't help that there aren't any scripts or instructions for building them. There are still sections of duplicate code here and there, but this PR covers the easy parts where entire modules are the same.
2 parents fa4cfeb + 25cca07 commit 034af08

File tree

16 files changed

+56
-889
lines changed

16 files changed

+56
-889
lines changed

library/std/src/sys/sgx/fs.rs

-308
This file was deleted.

library/std/src/sys/sgx/io.rs

-47
This file was deleted.

library/std/src/sys/sgx/mod.rs

+4
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,18 @@ pub mod condvar;
1717
pub mod env;
1818
pub mod ext;
1919
pub mod fd;
20+
#[path = "../unsupported/fs.rs"]
2021
pub mod fs;
22+
#[path = "../unsupported/io.rs"]
2123
pub mod io;
2224
pub mod memchr;
2325
pub mod mutex;
2426
pub mod net;
2527
pub mod os;
2628
pub mod path;
29+
#[path = "../unsupported/pipe.rs"]
2730
pub mod pipe;
31+
#[path = "../unsupported/process.rs"]
2832
pub mod process;
2933
pub mod rwlock;
3034
pub mod stack_overflow;

0 commit comments

Comments
 (0)