Code review: No optional needed

justinmc · justinmc · commit 35ae1b9de08c · 2022-04-27T10:37:14.000-07:00
diff --git a/shell/platform/windows/platform_handler_win32.cc b/shell/platform/windows/platform_handler_win32.cc
@@ -150,11 +150,11 @@ std::variant<std::wstring, int> ScopedClipboard::GetString() {
     return ::GetLastError();
   }
   ScopedGlobalLock locked_data(data);
-  std::optional<std::wstring> string = static_cast<wchar_t*>(locked_data.get());
-  if (!string) {
+
+  if (!locked_data.get()) {
     return ::GetLastError();
   }
-  return string.value();
+  return static_cast<wchar_t*>(locked_data.get());
 }
 
 int ScopedClipboard::SetString(const std::wstring string) {

Original file line number	Diff line number	Diff line change
`@@ -150,11 +150,11 @@ std::variant<std::wstring, int> ScopedClipboard::GetString() {`
`150`	`150`	`return ::GetLastError();`
`151`	`151`	`}`
`152`	`152`	`ScopedGlobalLock locked_data(data);`
`153`		`- std::optional<std::wstring> string = static_cast<wchar_t*>(locked_data.get());`
`154`		`- if (!string) {`
	`153`	`+`
	`154`	`+ if (!locked_data.get()) {`
`155`	`155`	`return ::GetLastError();`
`156`	`156`	`}`
`157`		`- return string.value();`
	`157`	`+ return static_cast<wchar_t*>(locked_data.get());`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`int ScopedClipboard::SetString(const std::wstring string) {`