Skip to content

Commit

Permalink
Rollup merge of rust-lang#129885 - cuishuang:master, r=scottmcm
Browse files Browse the repository at this point in the history
chore: remove repetitive words
  • Loading branch information
matthiaskrgr authored Sep 3, 2024
2 parents e41afdc + 2649882 commit 83524b9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion core/src/mem/transmutability.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ where
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
pub struct Assume {
/// When `false`, [`TransmuteFrom`] is not implemented for transmutations
/// that might violate the the alignment requirements of references; e.g.:
/// that might violate the alignment requirements of references; e.g.:
///
#[cfg_attr(bootstrap, doc = "```rust,ignore not runnable on bootstrap")]
#[cfg_attr(not(bootstrap), doc = "```compile_fail,E0277")]
Expand Down
2 changes: 1 addition & 1 deletion std/src/sync/reentrant_lock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ cfg_if!(
// match do we read out the actual TID.
// Note also that we can use relaxed atomic operations here, because
// we only ever read from the tid if `tls_addr` matches the current
// TLS address. In that case, either the the tid has been set by
// TLS address. In that case, either the tid has been set by
// the current thread, or by a thread that has terminated before
// the current thread was created. In either case, no further
// synchronization is needed (as per <https://github.com/rust-lang/miri/issues/3450>)
Expand Down

0 comments on commit 83524b9

Please sign in to comment.