Skip to content

Commit 3cfa3e1

Browse files
committed
Auto merge of #102995 - JohnTitor:rollup-yomkwge, r=JohnTitor
Rollup of 7 pull requests Successful merges: - #102641 (Support casting boxes to dyn*) - #102836 (rustc_target: Fix json target specs using LLD linker flavors in link args) - #102949 (should-skip-this: add missing backslash) - #102967 (Add test for issue 102964) - #102971 (tidy: error if a lang feature is already present) - #102974 (Fix small word dupe typos) - #102980 (rustdoc: merge separate `.item-info` CSS) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6fd578e + ffe72e2 commit 3cfa3e1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

std/src/io/error/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ fn test_errorkind_packing() {
8686
assert_eq!(Error::from(ErrorKind::NotFound).kind(), ErrorKind::NotFound);
8787
assert_eq!(Error::from(ErrorKind::PermissionDenied).kind(), ErrorKind::PermissionDenied);
8888
assert_eq!(Error::from(ErrorKind::Uncategorized).kind(), ErrorKind::Uncategorized);
89-
// Check that the innards look like like what we want.
89+
// Check that the innards look like what we want.
9090
assert_matches!(
9191
Error::from(ErrorKind::OutOfMemory).repr.data(),
9292
ErrorData::Simple(ErrorKind::OutOfMemory),

std/src/sys/unix/kernel_copy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
//! Since those syscalls have requirements that cannot be fully checked in advance and
2121
//! gathering additional information about file descriptors would require additional syscalls
2222
//! anyway it simply attempts to use them one after another (guided by inaccurate hints) to
23-
//! figure out which one works and and falls back to the generic read-write copy loop if none of them
23+
//! figure out which one works and falls back to the generic read-write copy loop if none of them
2424
//! does.
2525
//! Once a working syscall is found for a pair of file descriptors it will be called in a loop
2626
//! until the copy operation is completed.

0 commit comments

Comments
 (0)