Skip to content

Commit

Permalink
Auto merge of rust-lang#115356 - devnexen:haiku_set_name_use_return, …
Browse files Browse the repository at this point in the history
…r=thomcc

`std::thread::set_name` exploit the return on haiku
  • Loading branch information
bors committed Nov 1, 2023
2 parents dd24c7b + 29b8593 commit 815b3ae
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion library/std/src/sys/unix/thread.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,9 @@ impl Thread {
pub fn set_name(name: &CStr) {
unsafe {
let thread_self = libc::find_thread(ptr::null_mut());
libc::rename_thread(thread_self, name.as_ptr());
let res = libc::rename_thread(thread_self, name.as_ptr());
// We have no good way of propagating errors here, but in debug-builds let's check that this actually worked.
debug_assert_eq!(res, libc::B_OK);
}
}

Expand Down

0 comments on commit 815b3ae

Please sign in to comment.