diff options
| author | bors <bors@rust-lang.org> | 2023-06-13 06:13:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-13 06:13:43 +0000 |
| commit | caeea3f0a21574419254c72b3e0863742d3c6fd0 (patch) | |
| tree | dbc47fdf3226927f4e15ee1a32d1eecd7a070bbf /library/std/src | |
| parent | de1ff0a8b559c300fb8145123accdfa8bda1031e (diff) | |
| parent | aee8e10a26ea1dd76c2ea11ace36f642c9f2ac50 (diff) | |
| download | rust-caeea3f0a21574419254c72b3e0863742d3c6fd0.tar.gz rust-caeea3f0a21574419254c72b3e0863742d3c6fd0.zip | |
Auto merge of #112575 - matthiaskrgr:rollup-7a8d7tg, r=matthiaskrgr
Rollup of 2 pull requests Successful merges: - #111885 (Don't ICE on unsized `extern "rust-call"` call) - #112558 (Fix typo in mod.rs) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/thread/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/thread/mod.rs b/library/std/src/thread/mod.rs index d9973185bc4..1230bb5deed 100644 --- a/library/std/src/thread/mod.rs +++ b/library/std/src/thread/mod.rs @@ -195,7 +195,7 @@ mod local; cfg_if::cfg_if! { if #[cfg(test)] { - // Avoid duplicating the global state assoicated with thread-locals between this crate and + // Avoid duplicating the global state associated with thread-locals between this crate and // realstd. Miri relies on this. pub use realstd::thread::{local_impl, AccessError, LocalKey}; } else { |