std: fix registering of Windows TLS destructors

joboet · joboet · commit 7953b56cb7c9 · 2023-10-05T10:58:39.000+02:00
diff --git a/library/std/src/sys/windows/thread_local_key.rs b/library/std/src/sys/windows/thread_local_key.rs
@@ -42,7 +42,7 @@ unsafe fn run_keyless_dtors() {
     // the case that this loop always terminates because we provide the
     // guarantee that a TLS key cannot be set after it is flagged for
     // destruction.
-    while let Some((ptr, dtor)) = DESTRUCTORS.borrow_mut().pop() {
+    while let Some((ptr, dtor)) = { DESTRUCTORS.borrow_mut().pop() } {
         (dtor)(ptr);
     }
     // We're done so free the memory.

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ unsafe fn run_keyless_dtors() {`
`42`	`42`	`// the case that this loop always terminates because we provide the`
`43`	`43`	`// guarantee that a TLS key cannot be set after it is flagged for`
`44`	`44`	`// destruction.`
`45`		`- while let Some((ptr, dtor)) = DESTRUCTORS.borrow_mut().pop() {`
	`45`	`+ while let Some((ptr, dtor)) = { DESTRUCTORS.borrow_mut().pop() } {`
`46`	`46`	`(dtor)(ptr);`
`47`	`47`	`}`
`48`	`48`	`// We're done so free the memory.`