Skip to content

Commit

Permalink
Auto merge of #123356 - joboet:set_current_size, r=<try>
Browse files Browse the repository at this point in the history
Reduce code size of `thread::set_current`

#123265 introduced a rather large binary size regression, because it added an `unwrap()` call on a `Result<(), Thread>`, which in turn pulled its rather heavy `Debug` implementation. This PR fixes this by readding the `rtassert!` that was removed.
  • Loading branch information
bors committed Apr 2, 2024
2 parents e2cf2cb + b5ccebf commit ae182b1
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions library/std/src/thread/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -684,9 +684,12 @@ thread_local! {

/// Sets the thread handle for the current thread.
///
/// Panics if the handle has been set already or when called from a TLS destructor.
/// Aborts if the handle has been set already to reduce code size.
pub(crate) fn set_current(thread: Thread) {
CURRENT.with(|current| current.set(thread).unwrap());
CURRENT.with(|current| {
rtassert!(current.get().is_none());
current.set(thread).unwrap();
});
}

/// Gets a handle to the thread that invokes it.
Expand Down

0 comments on commit ae182b1

Please sign in to comment.