mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #123346 - workingjubilee:rollup-ix9qpsi, r=workingjubilee

Browse Source 
Rollup of 2 pull requests

Successful merges:

 - #123323 (std:🧵 set_name change for solaris/illumos.)
 - #123330 (Pass RUST_BACKTRACE when running docker.)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2024-04-02 01:08:41 +00:00
commit 31075bb493
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/std/src/sys/pal/unix/thread.rs
View File

@ -182,8 +182,11 @@ fn pthread_setname_np(
if let Some(f) = pthread_setname_np.get() { if let Some(f) = pthread_setname_np.get() {
#[cfg(target_os = "nto")] #[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()) }; let res = unsafe { f(libc::pthread_self(), name.as_ptr()) };
debug_assert_eq!(res, 0); debug_assert_eq!(res, 0);
} }
@ -368,6 +371,8 @@ fn drop(&mut self) {
target_os = "tvos", target_os = "tvos",
target_os = "watchos", target_os = "watchos",
target_os = "nto", 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] { fn truncate_cstr<const MAX_WITH_NUL: usize>(cstr: &CStr) -> [libc::c_char; MAX_WITH_NUL] {
let mut result = [0; MAX_WITH_NUL]; let mut result = [0; MAX_WITH_NUL];

1
src/ci/docker/run.sh
View File

@ -323,6 +323,7 @@ docker \
--env GITHUB_ACTIONS \ --env GITHUB_ACTIONS \
--env GITHUB_REF \ --env GITHUB_REF \
--env GITHUB_STEP_SUMMARY="/checkout/obj/${SUMMARY_FILE}" \ --env GITHUB_STEP_SUMMARY="/checkout/obj/${SUMMARY_FILE}" \
--env RUST_BACKTRACE \
--env TOOLSTATE_REPO_ACCESS_TOKEN \ --env TOOLSTATE_REPO_ACCESS_TOKEN \
--env TOOLSTATE_REPO \ --env TOOLSTATE_REPO \
--env TOOLSTATE_PUBLISH \ --env TOOLSTATE_PUBLISH \