diff options
| author | bors <bors@rust-lang.org> | 2022-10-13 03:33:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-13 03:33:40 +0000 |
| commit | 3cf5fc58d56adeee42abb7e5059c718b0a86857d (patch) | |
| tree | 82819af2de9e0f2863eb6ead3756f3350b81d351 /library/std/src | |
| parent | 2a9217601c0e5ae83fa8bca6797137a6d2f7e4e5 (diff) | |
| parent | e8029368d3ccba813cd1ed56a7cf5c0ab124f2f0 (diff) | |
| download | rust-3cf5fc58d56adeee42abb7e5059c718b0a86857d.tar.gz rust-3cf5fc58d56adeee42abb7e5059c718b0a86857d.zip | |
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
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/io/error/tests.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/unix/kernel_copy.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/io/error/tests.rs b/library/std/src/io/error/tests.rs index c897a5e8701..16c634e9afd 100644 --- a/library/std/src/io/error/tests.rs +++ b/library/std/src/io/error/tests.rs @@ -86,7 +86,7 @@ fn test_errorkind_packing() { assert_eq!(Error::from(ErrorKind::NotFound).kind(), ErrorKind::NotFound); assert_eq!(Error::from(ErrorKind::PermissionDenied).kind(), ErrorKind::PermissionDenied); assert_eq!(Error::from(ErrorKind::Uncategorized).kind(), ErrorKind::Uncategorized); - // Check that the innards look like like what we want. + // Check that the innards look like what we want. assert_matches!( Error::from(ErrorKind::OutOfMemory).repr.data(), ErrorData::Simple(ErrorKind::OutOfMemory), diff --git a/library/std/src/sys/unix/kernel_copy.rs b/library/std/src/sys/unix/kernel_copy.rs index 8f7abb55e23..94546ca09d0 100644 --- a/library/std/src/sys/unix/kernel_copy.rs +++ b/library/std/src/sys/unix/kernel_copy.rs @@ -20,7 +20,7 @@ //! Since those syscalls have requirements that cannot be fully checked in advance and //! gathering additional information about file descriptors would require additional syscalls //! anyway it simply attempts to use them one after another (guided by inaccurate hints) to -//! figure out which one works and and falls back to the generic read-write copy loop if none of them +//! figure out which one works and falls back to the generic read-write copy loop if none of them //! does. //! Once a working syscall is found for a pair of file descriptors it will be called in a loop //! until the copy operation is completed. |
