Skip to content

Commit 3098538

Browse files
committed
Auto merge of rust-lang#112575 - matthiaskrgr:rollup-7a8d7tg, r=matthiaskrgr
Rollup of 2 pull requests Successful merges: - rust-lang#111885 (Don't ICE on unsized `extern "rust-call"` call) - rust-lang#112558 (Fix typo in mod.rs) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 438f0a6 + 10d8d65 commit 3098538

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

std/src/thread/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ mod local;
195195

196196
cfg_if::cfg_if! {
197197
if #[cfg(test)] {
198-
// Avoid duplicating the global state assoicated with thread-locals between this crate and
198+
// Avoid duplicating the global state associated with thread-locals between this crate and
199199
// realstd. Miri relies on this.
200200
pub use realstd::thread::{local_impl, AccessError, LocalKey};
201201
} else {

0 commit comments

Comments
 (0)