Simplify ConsoleModeGuard::set()

djc · djc · commit 8623cd606afa · 2025-02-27T11:09:08.000+01:00
diff --git a/src/windows_term/mod.rs b/src/windows_term/mod.rs
@@ -106,9 +106,9 @@ struct ConsoleModeGuard {
 
 impl ConsoleModeGuard {
     fn set(handle: HANDLE, mode: CONSOLE_MODE, enable: bool) -> Option<Self> {
-        set_console_mode(handle, mode, enable).map(|restore_mode| ConsoleModeGuard {
+        Some(ConsoleModeGuard {
             handle,
-            restore_mode,
+            restore_mode: set_console_mode(handle, mode, enable)?,
         })
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -106,9 +106,9 @@ struct ConsoleModeGuard {`
`106`	`106`
`107`	`107`	`impl ConsoleModeGuard {`
`108`	`108`	`fn set(handle: HANDLE, mode: CONSOLE_MODE, enable: bool) -> Option<Self> {`
`109`		`- set_console_mode(handle, mode, enable).map(\|restore_mode\| ConsoleModeGuard {`
	`109`	`+ Some(ConsoleModeGuard {`
`110`	`110`	`handle,`
`111`		`- restore_mode,`
	`111`	`+ restore_mode: set_console_mode(handle, mode, enable)?,`
`112`	`112`	`})`
`113`	`113`	`}`
`114`	`114`	`}`