Fix the error handling on modern Rust

MOZGIII · MOZGIII · commit f7573668e413 · 2022-12-25T19:28:22.000+04:00
See rust-lang/rust#79965
diff --git a/efivar/src/error.rs b/efivar/src/error.rs
@@ -38,7 +38,7 @@ fn is_variable_not_found_error(err: &io::Error) -> bool {
 
 #[cfg(target_os = "windows")]
 fn is_variable_not_found_error(err: &io::Error) -> bool {
-    err.kind() == io::ErrorKind::Other && err.raw_os_error() == Some(203)
+    err.raw_os_error() == Some(203)
 }
 
 #[cfg(not(target_os = "windows"))]
@@ -49,7 +49,7 @@ fn is_buffer_too_small_error(_err: &io::Error) -> bool {
 
 #[cfg(target_os = "windows")]
 fn is_buffer_too_small_error(err: &io::Error) -> bool {
-    err.kind() == io::ErrorKind::Other && err.raw_os_error() == Some(122)
+    err.raw_os_error() == Some(122)
 }
 
 #[cfg(not(target_os = "windows"))]
@@ -59,7 +59,7 @@ fn is_permission_denied_error(err: &io::Error) -> bool {
 
 #[cfg(target_os = "windows")]
 fn is_permission_denied_error(err: &io::Error) -> bool {
-    err.kind() == io::ErrorKind::Other && err.raw_os_error() == Some(1314)
+    err.raw_os_error() == Some(1314)
 }
 
 impl Error {
@@ -75,7 +75,7 @@ impl Error {
         }
 
         if is_permission_denied_error(&error) {
-            return Error::PermissionDenied { name }
+            return Error::PermissionDenied { name };
         }
 
         Error::VarUnknownError { name, error }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ fn is_variable_not_found_error(err: &io::Error) -> bool {`
`38`	`38`
`39`	`39`	`#[cfg(target_os = "windows")]`
`40`	`40`	`fn is_variable_not_found_error(err: &io::Error) -> bool {`
`41`		`- err.kind() == io::ErrorKind::Other && err.raw_os_error() == Some(203)`
	`41`	`+ err.raw_os_error() == Some(203)`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`#[cfg(not(target_os = "windows"))]`
`@@ -49,7 +49,7 @@ fn is_buffer_too_small_error(_err: &io::Error) -> bool {`
`49`	`49`
`50`	`50`	`#[cfg(target_os = "windows")]`
`51`	`51`	`fn is_buffer_too_small_error(err: &io::Error) -> bool {`
`52`		`- err.kind() == io::ErrorKind::Other && err.raw_os_error() == Some(122)`
	`52`	`+ err.raw_os_error() == Some(122)`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`#[cfg(not(target_os = "windows"))]`
`@@ -59,7 +59,7 @@ fn is_permission_denied_error(err: &io::Error) -> bool {`
`59`	`59`
`60`	`60`	`#[cfg(target_os = "windows")]`
`61`	`61`	`fn is_permission_denied_error(err: &io::Error) -> bool {`
`62`		`- err.kind() == io::ErrorKind::Other && err.raw_os_error() == Some(1314)`
	`62`	`+ err.raw_os_error() == Some(1314)`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`impl Error {`
`@@ -75,7 +75,7 @@ impl Error {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`if is_permission_denied_error(&error) {`
`78`		`- return Error::PermissionDenied { name }`
	`78`	`+ return Error::PermissionDenied { name };`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`Error::VarUnknownError { name, error }`