diff options
| author | bors <bors@rust-lang.org> | 2025-03-13 10:27:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-13 10:27:30 +0000 |
| commit | a2aba0578ba440130d2ee213fc9dfdaa7095bdb5 (patch) | |
| tree | 58d1d86e73a6dab6d4eefb07876db427ce9834af /library/std/src/sys/alloc/mod.rs | |
| parent | 961351c76c812e3aeb65bfb542742500a6436aed (diff) | |
| parent | 3bfce83cb2e880a7f2a601326a56a57abaf6bd8c (diff) | |
| download | rust-a2aba0578ba440130d2ee213fc9dfdaa7095bdb5.tar.gz rust-a2aba0578ba440130d2ee213fc9dfdaa7095bdb5.zip | |
Auto merge of #138448 - matthiaskrgr:rollup-3onhkse, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #126856 (remove deprecated tool `rls`) - #133981 (rustdoc-json: Refractor and document Id's) - #136842 (Add libstd support for Trusty targets) - #137355 (Implement `read_buf` and vectored read/write for SGX stdio) - #138162 (Update the standard library to Rust 2024) - #138273 (metadata: Ignore sysroot when doing the manual native lib search in rustc) - #138346 (naked functions: on windows emit `.endef` without the symbol name) - #138370 (Simulate OOM for the `try_oom_error` test) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/alloc/mod.rs')
| -rw-r--r-- | library/std/src/sys/alloc/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/sys/alloc/mod.rs b/library/std/src/sys/alloc/mod.rs index 2c0b533a570..8489e17c971 100644 --- a/library/std/src/sys/alloc/mod.rs +++ b/library/std/src/sys/alloc/mod.rs @@ -72,6 +72,7 @@ cfg_if::cfg_if! { target_family = "unix", target_os = "wasi", target_os = "teeos", + target_os = "trusty", ))] { mod unix; } else if #[cfg(target_os = "windows")] { |