Skip to content

Commit

Permalink
Rollup merge of rust-lang#83110 - hyksm:fix-typo, r=jonas-schievink
Browse files Browse the repository at this point in the history
Fix typos in `library/core/src/ptr/mod.rs` and `library/std/src/sys_common/thread_local_dtor.rs`

adress -> address
  • Loading branch information
Dylan-DPC authored Mar 15, 2021
2 parents 51e6acf + 5ec0540 commit 7fcef79
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion library/core/src/ptr/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ unsafe fn swap_nonoverlapping_bytes(x: *mut u8, y: *mut u8, len: usize) {
let t = t.as_mut_ptr() as *mut u8;

// SAFETY: As `i < len`, and as the caller must guarantee that `x` and `y` are valid
// for `len` bytes, `x + i` and `y + i` must be valid adresses, which fulfills the
// for `len` bytes, `x + i` and `y + i` must be valid addresses, which fulfills the
// safety contract for `add`.
//
// Also, the caller must guarantee that `x` and `y` are valid for writes, properly aligned,
Expand Down
2 changes: 1 addition & 1 deletion library/std/src/sys_common/thread_local_dtor.rs
Original file line number Diff line number Diff line change
@@ -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.
Expand Down

0 comments on commit 7fcef79

Please sign in to comment.