Skip to content

Commit 080e0fc

Browse files
committed
Auto merge of #139992 - matthiaskrgr:rollup-ak3uibu, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #139351 (Autodiff batching2) - #139483 (f*::NAN: guarantee that this is a quiet NaN) - #139498 (Ignore zero-sized types in wasm future-compat warning) - #139967 (Introduce and use specialized `//@ ignore-auxiliary` for test support files instead of using `//@ ignore-test`) - #139969 (update libc) - #139971 (Make C string merging test work on MIPS) - #139974 (Change `InterpCx::instantiate*` function visibility to pub) - #139977 (Fix drop handling in `hint::select_unpredictable`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5f55933 + a829459 commit 080e0fc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tests/pass/tls/tls_leak_main_thread_allowed.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub fn main() {
1313
TLS.set(Some(Box::leak(Box::new(123))));
1414

1515
// We can only ignore leaks on targets that use `#[thread_local]` statics to implement
16-
// `thread_local!`. Ignore the test on targest that don't.
16+
// `thread_local!`. Ignore the test on targets that don't.
1717
if cfg!(target_thread_local) {
1818
thread_local! {
1919
static TLS_KEY: Cell<Option<&'static i32>> = Cell::new(None);

0 commit comments

Comments
 (0)