diff options
| author | bors <bors@rust-lang.org> | 2024-04-14 09:02:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-14 09:02:22 +0000 |
| commit | 78bc0a5656337478cb4163d01ee4429bab5087a9 (patch) | |
| tree | c27ada3bd6433ac29be96ef4e6101ab6ecdb4485 /library/std/src/sys/sync/rwlock/queue.rs | |
| parent | a3269e920cf2f246246d53c8e637570b183960c0 (diff) | |
| parent | ab65c68585bae5bfa5a2deee8416231c0c13e708 (diff) | |
| download | rust-78bc0a5656337478cb4163d01ee4429bab5087a9.tar.gz rust-78bc0a5656337478cb4163d01ee4429bab5087a9.zip | |
Auto merge of #123913 - matthiaskrgr:rollup-w8stnwl, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #123651 (Thread local updates for idiomatic examples) - #123699 (run-make-support: tidy up support library) - #123779 (OpenBSD fix long socket addresses) - #123875 (Doc: replace x with y for hexa-decimal fmt) - #123879 (Add missing `unsafe` to some internal `std` functions) - #123889 (reduce tidy overheads in run-make checks) - #123898 (Generic associated consts: Check regions earlier when comparing impl with trait item def) - #123902 (compiletest: Update rustfix to 0.8.1) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/sync/rwlock/queue.rs')
| -rw-r--r-- | library/std/src/sys/sync/rwlock/queue.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/sys/sync/rwlock/queue.rs b/library/std/src/sys/sync/rwlock/queue.rs index d1918855797..337cc6c2ca0 100644 --- a/library/std/src/sys/sync/rwlock/queue.rs +++ b/library/std/src/sys/sync/rwlock/queue.rs @@ -202,7 +202,7 @@ impl Node { fn prepare(&mut self) { // Fall back to creating an unnamed `Thread` handle to allow locking in // TLS destructors. - self.thread.get_or_init(|| thread::try_current().unwrap_or_else(|| Thread::new(None))); + self.thread.get_or_init(|| thread::try_current().unwrap_or_else(Thread::new_unnamed)); self.completed = AtomicBool::new(false); } |