Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a2aba05

Browse files
committedMar 13, 2025
Auto merge of rust-lang#138448 - matthiaskrgr:rollup-3onhkse, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#126856 (remove deprecated tool `rls`) - rust-lang#133981 (rustdoc-json: Refractor and document Id's) - rust-lang#136842 (Add libstd support for Trusty targets) - rust-lang#137355 (Implement `read_buf` and vectored read/write for SGX stdio) - rust-lang#138162 (Update the standard library to Rust 2024) - rust-lang#138273 (metadata: Ignore sysroot when doing the manual native lib search in rustc) - rust-lang#138346 (naked functions: on windows emit `.endef` without the symbol name) - rust-lang#138370 (Simulate OOM for the `try_oom_error` test) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 961351c + 3bfce83 commit a2aba05

File tree

74 files changed

+560
-406
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+560
-406
lines changed
 

‎library/std/src/net/udp.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
target_os = "emscripten",
55
all(target_os = "wasi", target_env = "p1"),
66
target_env = "sgx",
7-
target_os = "xous"
7+
target_os = "xous",
8+
target_os = "trusty",
89
))
910
))]
1011
mod tests;

‎library/std/src/os/fd/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ mod raw;
1313
mod owned;
1414

1515
// Implementations for `AsRawFd` etc. for network types.
16+
#[cfg(not(target_os = "trusty"))]
1617
mod net;
1718

1819
#[cfg(test)]
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.