averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate llvm::Optional to std::optional

Browse Source 
LLVM has removed llvm::Optional, move over to std::optional. Also
clang-format to fix up all the renamed #includes.
This commit is contained in:
Ben Barham
2024-02-02 22:19:39 -08:00
parent d3d4bd203c
commit ef8825bfe6
810 changed files with 8035 additions and 8718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/swift/Basic/JSONSerialization.h
View File

@@ -21,13 +21,13 @@
#define SWIFT_BASIC_JSONSERIALIZATION_H
/* #include "swift/Basic/LLVM.h" */
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/Regex.h"
#include "llvm/Support/raw_ostream.h"
#include <optional>
#include <map>
#include <vector>
@@ -475,8 +475,8 @@ public:
}
template <typename T>
void mapOptional(llvm::StringRef Key, llvm::Optional<T> &Val) {
processKeyWithDefault(Key, Val, llvm::Optional<T>(), /*Required=*/false);
void mapOptional(llvm::StringRef Key, std::optional<T> &Val) {
processKeyWithDefault(Key, Val, std::optional<T>(), /*Required=*/false);
}
template <typename T>
@@ -492,8 +492,8 @@ public:
private:
template <typename T>
void processKeyWithDefault(llvm::StringRef Key, llvm::Optional<T> &Val,
const llvm::Optional<T> &DefaultValue,
void processKeyWithDefault(llvm::StringRef Key, std::optional<T> &Val,
const std::optional<T> &DefaultValue,
bool Required) {
assert(!DefaultValue.has_value() &&
"Optional<T> shouldn't have a value!");