averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +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

25
lib/IDE/ModuleInterfacePrinting.cpp
View File

@@ -54,9 +54,9 @@ public:
private:
void printDeclPre(const Decl *D,
llvm::Optional<BracketOptions> Bracket) override;
std::optional<BracketOptions> Bracket) override;
void printDeclPost(const Decl *D,
llvm::Optional<BracketOptions> Bracket) override;
std::optional<BracketOptions> Bracket) override;
void avoidPrintDeclPost(const Decl *D) override;
// Forwarding implementations.
@@ -85,15 +85,16 @@ private:
void printModuleRef(ModuleEntity Mod, Identifier Name) override {
return OtherPrinter.printModuleRef(Mod, Name);
}
void printSynthesizedExtensionPre(
const ExtensionDecl *ED, TypeOrExtensionDecl Target,
llvm::Optional<BracketOptions> Bracket) override {
void
printSynthesizedExtensionPre(const ExtensionDecl *ED,
TypeOrExtensionDecl Target,
std::optional<BracketOptions> Bracket) override {
return OtherPrinter.printSynthesizedExtensionPre(ED, Target, Bracket);
}
void printSynthesizedExtensionPost(
const ExtensionDecl *ED, TypeOrExtensionDecl Target,
llvm::Optional<BracketOptions> Bracket) override {
std::optional<BracketOptions> Bracket) override {
return OtherPrinter.printSynthesizedExtensionPost(ED, Target, Bracket);
}
@@ -221,14 +222,14 @@ static bool extensionHasClangNode(ExtensionDecl *ext) {
return static_cast<bool>(swift::ide::extensionGetClangNode(ext));
}
llvm::Optional<StringRef> swift::ide::findGroupNameForUSR(ModuleDecl *M,
StringRef USR) {
std::optional<StringRef> swift::ide::findGroupNameForUSR(ModuleDecl *M,
StringRef USR) {
for (auto File : M->getTopLevelModule()->getFiles()) {
if (auto Name = File->getGroupNameByUSR(USR)) {
return Name;
}
}
return llvm::None;
return std::nullopt;
}
/// Prints a single decl using the \p Printer and \p Options provided. If
@@ -955,7 +956,7 @@ void ClangCommentPrinter::avoidPrintDeclPost(const Decl *D) {
}
void ClangCommentPrinter::printDeclPre(const Decl *D,
llvm::Optional<BracketOptions> Bracket) {
std::optional<BracketOptions> Bracket) {
// Skip parameters, since we do not gracefully handle nested declarations on a
// single line.
// FIXME: we should fix that, since it also affects struct members, etc.
@@ -972,8 +973,8 @@ void ClangCommentPrinter::printDeclPre(const Decl *D,
return OtherPrinter.printDeclPre(D, Bracket);
}
void ClangCommentPrinter::printDeclPost(
const Decl *D, llvm::Optional<BracketOptions> Bracket) {
void ClangCommentPrinter::printDeclPost(const Decl *D,
std::optional<BracketOptions> Bracket) {
OtherPrinter.printDeclPost(D, Bracket);
// Skip parameters; see printDeclPre().