Skip to content

Commit deb7e87

Browse files
committed
Auto merge of #148412 - matthiaskrgr:rollup-59a302x, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang/rust#146573 (Constify Range functions) - rust-lang/rust#146699 (Add `is_ascii` function optimized for LoongArch64 for [u8]) - rust-lang/rust#148026 (std: don't leak the thread closure if destroying the thread attributes fails) - rust-lang/rust#148135 (Ignore unix socket related tests for VxWorks) - rust-lang/rust#148211 (clippy fixes and code simplification) - rust-lang/rust#148395 (Generalize branch references) - rust-lang/rust#148405 (Fix suggestion when there were a colon already in generics) r? `@ghost` `@rustbot` modify labels: rollup
2 parents cd53100 + 5da2335 commit deb7e87

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/shims/io_error.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl From<Scalar> for IoError {
5656
}
5757

5858
// This mapping should match `decode_error_kind` in
59-
// <https://github.com/rust-lang/rust/blob/master/library/std/src/sys/pal/unix/mod.rs>.
59+
// <https://github.com/rust-lang/rust/blob/HEAD/library/std/src/sys/pal/unix/mod.rs>.
6060
const UNIX_IO_ERROR_TABLE: &[(&str, std::io::ErrorKind)] = {
6161
use std::io::ErrorKind::*;
6262
&[
@@ -103,7 +103,7 @@ const UNIX_IO_ERROR_TABLE: &[(&str, std::io::ErrorKind)] = {
103103
]
104104
};
105105
// This mapping should match `decode_error_kind` in
106-
// <https://github.com/rust-lang/rust/blob/master/library/std/src/sys/pal/windows/mod.rs>.
106+
// <https://github.com/rust-lang/rust/blob/HEAD/library/std/src/sys/pal/windows/mod.rs>.
107107
const WINDOWS_IO_ERROR_TABLE: &[(&str, std::io::ErrorKind)] = {
108108
use std::io::ErrorKind::*;
109109
// It's common for multiple error codes to map to the same io::ErrorKind. We have all for the

0 commit comments

Comments
 (0)