diff options
| author | bors <bors@rust-lang.org> | 2024-09-06 06:42:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-06 06:42:23 +0000 |
| commit | 0903724a9b839bb642ce537ababe6625e8887c4f (patch) | |
| tree | a327c16521758286ea353293be72e4104cba2442 /compiler/rustc_data_structures/src/sync | |
| parent | 18d358c63c7ae8ff9d921f3464707bedb23254d2 (diff) | |
| parent | 2fccb4b358e06c9c33d1ed18b280aa1a776c2f36 (diff) | |
| download | rust-0903724a9b839bb642ce537ababe6625e8887c4f.tar.gz rust-0903724a9b839bb642ce537ababe6625e8887c4f.zip | |
Auto merge of #3862 - rust-lang:rustup-2024-09-06, r=RalfJung
Automatic Rustup
Diffstat (limited to 'compiler/rustc_data_structures/src/sync')
| -rw-r--r-- | compiler/rustc_data_structures/src/sync/worker_local.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_data_structures/src/sync/worker_local.rs b/compiler/rustc_data_structures/src/sync/worker_local.rs index 4950481d311..b6efcada10b 100644 --- a/compiler/rustc_data_structures/src/sync/worker_local.rs +++ b/compiler/rustc_data_structures/src/sync/worker_local.rs @@ -19,7 +19,7 @@ impl RegistryId { /// index within the registry. This panics if the current thread is not associated with this /// registry. /// - /// Note that there's a race possible where the identifer in `THREAD_DATA` could be reused + /// Note that there's a race possible where the identifier in `THREAD_DATA` could be reused /// so this can succeed from a different registry. #[cfg(parallel_compiler)] fn verify(self) -> usize { @@ -50,7 +50,7 @@ struct ThreadData { } thread_local! { - /// A thread local which contains the identifer of `REGISTRY` but allows for faster access. + /// A thread local which contains the identifier of `REGISTRY` but allows for faster access. /// It also holds the index of the current thread. static THREAD_DATA: ThreadData = const { ThreadData { registry_id: Cell::new(RegistryId(ptr::null())), @@ -66,7 +66,7 @@ impl Registry { /// Gets the registry associated with the current thread. Panics if there's no such registry. pub fn current() -> Self { - REGISTRY.with(|registry| registry.get().cloned().expect("No assocated registry")) + REGISTRY.with(|registry| registry.get().cloned().expect("No associated registry")) } /// Registers the current thread with the registry so worker locals can be used on it. @@ -92,7 +92,7 @@ impl Registry { } } - /// Gets the identifer of this registry. + /// Gets the identifier of this registry. fn id(&self) -> RegistryId { RegistryId(&*self.0) } |
