From 3b50c3e3204e9c3878ecde4d240cac425e2d7c03 Mon Sep 17 00:00:00 2001 From: Pavel Grigorenko Date: Thu, 12 Sep 2024 02:53:12 +0300 Subject: [PATCH 1/3] Stabilize `std::io::ErrorKind::QuotaExceeded` Also drop "Filesystem" from its name --- src/shims/io_error.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shims/io_error.rs b/src/shims/io_error.rs index 38aa181cb4..1a95ae1e7d 100644 --- a/src/shims/io_error.rs +++ b/src/shims/io_error.rs @@ -43,7 +43,7 @@ const UNIX_IO_ERROR_TABLE: &[(&str, std::io::ErrorKind)] = { ("ECONNREFUSED", ConnectionRefused), ("ECONNRESET", ConnectionReset), ("EDEADLK", Deadlock), - ("EDQUOT", FilesystemQuotaExceeded), + ("EDQUOT", QuotaExceeded), ("EEXIST", AlreadyExists), ("EFBIG", FileTooLarge), ("EHOSTUNREACH", HostUnreachable), From 250e0f3724c62f58091374378fb29d05f323c238 Mon Sep 17 00:00:00 2001 From: The Miri Cronjob Bot Date: Sun, 8 Dec 2024 04:55:19 +0000 Subject: [PATCH 2/3] Preparing for merge from rustc --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index ee21f2136c..57d0b27dfd 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -75716b45105e443199ce9800c7009ddfd6d2be53 +728f2daab42ba8f1b3d5caab62495798d1eabfa1 From 572c25ef54fd844b35af726a4d4acbdfb8b40495 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 8 Dec 2024 08:21:20 +0100 Subject: [PATCH 3/3] fix build --- src/shims/io_error.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shims/io_error.rs b/src/shims/io_error.rs index 7596db8a19..acf3f74a93 100644 --- a/src/shims/io_error.rs +++ b/src/shims/io_error.rs @@ -99,8 +99,8 @@ const WINDOWS_IO_ERROR_TABLE: &[(&str, std::io::ErrorKind)] = { ("ERROR_POSSIBLE_DEADLOCK", Deadlock), ("ERROR_DIR_NOT_EMPTY", DirectoryNotEmpty), ("ERROR_CANT_RESOLVE_FILENAME", FilesystemLoop), - ("ERROR_DISK_QUOTA_EXCEEDED", FilesystemQuotaExceeded), - ("WSAEDQUOT", FilesystemQuotaExceeded), + ("ERROR_DISK_QUOTA_EXCEEDED", QuotaExceeded), + ("WSAEDQUOT", QuotaExceeded), ("ERROR_FILE_TOO_LARGE", FileTooLarge), ("ERROR_HOST_UNREACHABLE", HostUnreachable), ("WSAEHOSTUNREACH", HostUnreachable),