Skip to content

Commit c7a753f

Browse files
authored
Rollup merge of rust-lang#84521 - CDirkx:hermit-dedup, r=Mark-Simulacrum
Reuse modules on `hermit` Reuse the following modules on `hermit`: - `unix::path` (contents identical) - `unsupported::io` (contents identical) - `unsupported::thread_local_key` (contents functionally identical, only changes are the panic error messages) `@rustbot` label: +T-libs-impl
2 parents 7146f37 + 840abaa commit c7a753f

File tree

4 files changed

+3
-92
lines changed

4 files changed

+3
-92
lines changed

std/src/sys/hermit/io.rs

-47
This file was deleted.

std/src/sys/hermit/mod.rs

+3
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ pub mod env;
2626
pub mod ext;
2727
pub mod fd;
2828
pub mod fs;
29+
#[path = "../unsupported/io.rs"]
2930
pub mod io;
3031
pub mod memchr;
3132
pub mod mutex;
3233
pub mod net;
3334
pub mod os;
35+
#[path = "../unix/path.rs"]
3436
pub mod path;
3537
#[path = "../unsupported/pipe.rs"]
3638
pub mod pipe;
@@ -40,6 +42,7 @@ pub mod rwlock;
4042
pub mod stdio;
4143
pub mod thread;
4244
pub mod thread_local_dtor;
45+
#[path = "../unsupported/thread_local_key.rs"]
4346
pub mod thread_local_key;
4447
pub mod time;
4548

std/src/sys/hermit/path.rs

-19
This file was deleted.

std/src/sys/hermit/thread_local_key.rs

-26
This file was deleted.

0 commit comments

Comments
 (0)