[llvm] [NFC] Replace `expectedToStdOptional` with `expectedToOptional` (PR #191359)

[Juan Manuel Martinez Caamaño via llvm-commits]

https://github.com/jmmartinez created https://github.com/llvm/llvm-project/pull/191359

Both implementations are currently equivalent. This is likely a leftover from the past, when `llvm::Optional` existed.

>From ce3a423158f91d405b3ab3840617bb57fb2b8b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Manuel=20Martinez=20Caama=C3=B1o?=
 <jmartinezcaamao at gmail.com>
Date: Fri, 10 Apr 2026 10:07:10 +0200
Subject: [PATCH] [NFC] Replace `expectedToStdOptional` with
 `expectedToOptional`

Both implementations are currently equivalent. This is likely a leftover
from the past, when `llvm::Optional` existed.
---
 llvm/include/llvm/Support/Error.h     | 7 -------
 llvm/tools/llvm-readobj/ELFDumper.cpp | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/llvm/include/llvm/Support/Error.h b/llvm/include/llvm/Support/Error.h
index c9fd16fdb7c2b..464ca8d66a517 100644
--- a/llvm/include/llvm/Support/Error.h
+++ b/llvm/include/llvm/Support/Error.h
@@ -1098,13 +1098,6 @@ template <typename T> std::optional<T> expectedToOptional(Expected<T> &&E) {
   return std::nullopt;
 }
 
-template <typename T> std::optional<T> expectedToStdOptional(Expected<T> &&E) {
-  if (E)
-    return std::move(*E);
-  consumeError(E.takeError());
-  return std::nullopt;
-}
-
 /// Helper for converting an Error to a bool.
 ///
 /// This method returns true if Err is in an error state, or false if it is
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index bcb580119fb85..988afcb16148d 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -6361,7 +6361,7 @@ static void processNotesHelper(
     for (const typename ELFT::Shdr &S : Sections) {
       if (S.sh_type != SHT_NOTE)
         continue;
-      StartNotesFn(expectedToStdOptional(Obj.getSectionName(S)), S.sh_offset,
+      StartNotesFn(expectedToOptional(Obj.getSectionName(S)), S.sh_offset,
                    S.sh_size, S.sh_addralign);
       Error Err = Error::success();
       size_t I = 0;