Skip to content

Commit 7d4b6dc

Browse files
authored
Rollup merge of #135153 - crystalstall:master, r=workingjubilee
chore: remove redundant words in comment
2 parents 8e2631b + 591bf63 commit 7d4b6dc

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

Diff for: library/std/src/ffi/os_str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ impl OsString {
550550
OsStr::from_inner_mut(self.inner.leak())
551551
}
552552

553-
/// Truncate the the `OsString` to the specified length.
553+
/// Truncate the `OsString` to the specified length.
554554
///
555555
/// # Panics
556556
/// Panics if `len` does not lie on a valid `OsStr` boundary

Diff for: library/std/src/pipe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ impl PipeReader {
9797
/// let mut jobs = vec![];
9898
/// let (reader, mut writer) = std::pipe::pipe()?;
9999
///
100-
/// // Write NUM_SLOT characters the the pipe.
100+
/// // Write NUM_SLOT characters the pipe.
101101
/// writer.write_all(&[b'|'; NUM_SLOT as usize])?;
102102
///
103103
/// // Spawn several processes that read a character from the pipe, do some work, then

Diff for: library/std/src/sync/poison/mutex.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ impl<T: ?Sized> Mutex<T> {
534534
/// # Errors
535535
///
536536
/// If another user of this mutex panicked while holding the mutex, then
537-
/// this call will return an error containing the the underlying data
537+
/// this call will return an error containing the underlying data
538538
/// instead.
539539
///
540540
/// # Examples

Diff for: src/ci/docker/host-x86_64/dist-riscv64-linux/patches/gcc/8.5.0/0002-hidden-jump-target.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=28509
1010
And this is the first version of the proposed binutils patch,
1111
https://sourceware.org/pipermail/binutils/2021-November/118398.html
1212

13-
After applying the binutils patch, I get the the unexpected error when
13+
After applying the binutils patch, I get the unexpected error when
1414
building libgcc,
1515

1616
/scratch/nelsonc/riscv-gnu-toolchain/riscv-gcc/libgcc/config/riscv/div.S:42:

Diff for: tests/ui/duplicate/multiple-types-with-same-name-and-derive.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Here, there are two types with the same name. One of these has a `derive` annotation, but in the
2-
// expansion these `impl`s are associated to the the *other* type. There is a suggestion to remove
2+
// expansion these `impl`s are associated to the *other* type. There is a suggestion to remove
33
// unneeded type parameters, but because we're now point at a type with no type parameters, the
44
// suggestion would suggest removing code from an empty span, which would ICE in nightly.
55
//

0 commit comments

Comments
 (0)