diff options
| author | Nicole L <dlegare.1001@gmail.com> | 2025-03-10 12:54:59 -0700 |
|---|---|---|
| committer | Nicole L <dlegare.1001@gmail.com> | 2025-03-10 12:54:59 -0700 |
| commit | f5dd3d13fc4685b2846f130f5e5b633c50cefc55 (patch) | |
| tree | a426d2cb00267e412a429fd77f8ee133d48c897c | |
| parent | 0b1a7ab3393e59f59a0d53e66cccb195dadc378e (diff) | |
| download | rust-f5dd3d13fc4685b2846f130f5e5b633c50cefc55.tar.gz rust-f5dd3d13fc4685b2846f130f5e5b633c50cefc55.zip | |
Update Trusty support to account for recent libstd reorganization
| -rw-r--r-- | library/std/src/sys/pal/trusty/mod.rs | 7 | ||||
| -rw-r--r-- | library/std/src/sys/stdio/mod.rs | 3 | ||||
| -rw-r--r-- | library/std/src/sys/stdio/trusty.rs (renamed from library/std/src/sys/pal/trusty/stdio.rs) | 0 |
3 files changed, 3 insertions, 7 deletions
diff --git a/library/std/src/sys/pal/trusty/mod.rs b/library/std/src/sys/pal/trusty/mod.rs index 2b2774119e1..7034b643d8e 100644 --- a/library/std/src/sys/pal/trusty/mod.rs +++ b/library/std/src/sys/pal/trusty/mod.rs @@ -7,19 +7,12 @@ pub mod args; mod common; #[path = "../unsupported/env.rs"] pub mod env; -#[path = "../unsupported/fs.rs"] -pub mod fs; -#[path = "../unsupported/io.rs"] -pub mod io; -#[path = "../unsupported/net.rs"] -pub mod net; #[path = "../unsupported/os.rs"] pub mod os; #[path = "../unsupported/pipe.rs"] pub mod pipe; #[path = "../unsupported/process.rs"] pub mod process; -pub mod stdio; #[path = "../unsupported/thread.rs"] pub mod thread; #[path = "../unsupported/time.rs"] diff --git a/library/std/src/sys/stdio/mod.rs b/library/std/src/sys/stdio/mod.rs index 2a9167bfe96..336d4c8527d 100644 --- a/library/std/src/sys/stdio/mod.rs +++ b/library/std/src/sys/stdio/mod.rs @@ -19,6 +19,9 @@ cfg_if::cfg_if! { } else if #[cfg(target_os = "teeos")] { mod teeos; pub use teeos::*; + } else if #[cfg(target_os = "trusty")] { + mod trusty; + pub use trusty::*; } else if #[cfg(target_os = "uefi")] { mod uefi; pub use uefi::*; diff --git a/library/std/src/sys/pal/trusty/stdio.rs b/library/std/src/sys/stdio/trusty.rs index d393e95394d..d393e95394d 100644 --- a/library/std/src/sys/pal/trusty/stdio.rs +++ b/library/std/src/sys/stdio/trusty.rs |