diff options
| author | bors <bors@rust-lang.org> | 2021-03-15 15:24:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-15 15:24:54 +0000 |
| commit | 2ccf06302c08d7d4911aad40e66a9a3ee731c6f9 (patch) | |
| tree | 407134d0127b6a7d759851a2a032f5b172ca845a /library/std/src | |
| parent | 7a7bbdb3abfa72ca717ef54ffc4f307d0d44de67 (diff) | |
| parent | 2816c110e01846dd737207f19ba3db11a20b887d (diff) | |
| download | rust-2ccf06302c08d7d4911aad40e66a9a3ee731c6f9.tar.gz rust-2ccf06302c08d7d4911aad40e66a9a3ee731c6f9.zip | |
Auto merge of #83149 - Dylan-DPC:rollup-ov70c5v, r=Dylan-DPC
Rollup of 10 pull requests
Successful merges:
- #82989 (Custom error on literal names from other languages)
- #83054 (Validate rustc_layout_scalar_valid_range_{start,end} attributes)
- #83098 (Find more invalid doc attributes)
- #83108 (Remove unused `opt_local_def_id_to_hir_id` function)
- #83110 (Fix typos in `library/core/src/ptr/mod.rs` and `library/std/src/sys_common/thread_local_dtor.rs`)
- #83113 (Minor refactoring in try_index_step)
- #83127 (Introduce `proc_macro_back_compat` lint, and emit for `time-macros-impl`)
- #83132 (Don't encode file information for span with a dummy location)
- #83141 (:arrow_up: rust-analyzer)
- #83144 (Introduce `rustc_interface::interface::Config::parse_sess_created` callback)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sys_common/thread_local_dtor.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/sys_common/thread_local_dtor.rs b/library/std/src/sys_common/thread_local_dtor.rs index 6f5ebf4a271..f9971fb6f21 100644 --- a/library/std/src/sys_common/thread_local_dtor.rs +++ b/library/std/src/sys_common/thread_local_dtor.rs @@ -1,6 +1,6 @@ //! Thread-local destructor //! -//! Besides thread-local "keys" (pointer-sized non-adressable thread-local store +//! Besides thread-local "keys" (pointer-sized non-addressable thread-local store //! with an associated destructor), many platforms also provide thread-local //! destructors that are not associated with any particular data. These are //! often more efficient. |