diff options
| author | bors <bors@rust-lang.org> | 2024-04-02 01:08:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-02 01:08:41 +0000 |
| commit | 31075bb493f49c2b739ff20b2e96a9045e1eba13 (patch) | |
| tree | 43e7ed45987fb694d5f8aac06a7657e93faae1d3 | |
| parent | dd5e502d4b095be205c07da1481846f0a07c43b4 (diff) | |
| parent | 347c579648c76b0d93fdff48a3488f42bcb0942b (diff) | |
| download | rust-31075bb493f49c2b739ff20b2e96a9045e1eba13.tar.gz rust-31075bb493f49c2b739ff20b2e96a9045e1eba13.zip | |
Auto merge of #123346 - workingjubilee:rollup-ix9qpsi, r=workingjubilee
Rollup of 2 pull requests Successful merges: - #123323 (std::thread: set_name change for solaris/illumos.) - #123330 (Pass RUST_BACKTRACE when running docker.) r? `@ghost` `@rustbot` modify labels: rollup
| -rw-r--r-- | library/std/src/sys/pal/unix/thread.rs | 7 | ||||
| -rwxr-xr-x | src/ci/docker/run.sh | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/library/std/src/sys/pal/unix/thread.rs b/library/std/src/sys/pal/unix/thread.rs index f1feeb530b3..a9ed7e7c75e 100644 --- a/library/std/src/sys/pal/unix/thread.rs +++ b/library/std/src/sys/pal/unix/thread.rs @@ -182,8 +182,11 @@ impl Thread { if let Some(f) = pthread_setname_np.get() { #[cfg(target_os = "nto")] - let name = truncate_cstr::<{ libc::_NTO_THREAD_NAME_MAX as usize }>(name); + const THREAD_NAME_MAX: usize = libc::_NTO_THREAD_NAME_MAX as usize; + #[cfg(any(target_os = "solaris", target_os = "illumos"))] + const THREAD_NAME_MAX: usize = 32; + let name = truncate_cstr::<{ THREAD_NAME_MAX }>(name); let res = unsafe { f(libc::pthread_self(), name.as_ptr()) }; debug_assert_eq!(res, 0); } @@ -368,6 +371,8 @@ impl Drop for Thread { target_os = "tvos", target_os = "watchos", target_os = "nto", + target_os = "solaris", + target_os = "illumos", ))] fn truncate_cstr<const MAX_WITH_NUL: usize>(cstr: &CStr) -> [libc::c_char; MAX_WITH_NUL] { let mut result = [0; MAX_WITH_NUL]; diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index 740eb7504f8..9d72fd8a55a 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -323,6 +323,7 @@ docker \ --env GITHUB_ACTIONS \ --env GITHUB_REF \ --env GITHUB_STEP_SUMMARY="/checkout/obj/${SUMMARY_FILE}" \ + --env RUST_BACKTRACE \ --env TOOLSTATE_REPO_ACCESS_TOKEN \ --env TOOLSTATE_REPO \ --env TOOLSTATE_PUBLISH \ |