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

32
lib/Serialization/ModuleFile.h
View File

@@ -77,7 +77,7 @@ class ModuleFile
/// Once this module file has been associated with the AST node representing
/// it, resolve the potentially-SDK-relative module-defining `.swiftinterface`
/// path to an absolute path.
llvm::Optional<std::string> ResolvedModuleDefiningFilename;
std::optional<std::string> ResolvedModuleDefiningFilename;
/// The cursor used to lazily load things from the file.
llvm::BitstreamCursor DeclTypeCursor;
@@ -96,7 +96,7 @@ public:
public:
const ModuleFileSharedCore::Dependency &Core;
llvm::Optional<ImportedModule> Import = llvm::None;
std::optional<ImportedModule> Import = std::nullopt;
SmallVector<Identifier, 4> spiGroups;
Dependency(const ModuleFileSharedCore::Dependency &coreDependency)
@@ -930,20 +930,20 @@ public:
const ProtocolDecl *proto, uint64_t contextData,
SmallVectorImpl<AssociatedTypeDecl *> &assocTypes) override;
llvm::Optional<StringRef> getGroupNameById(unsigned Id) const;
llvm::Optional<StringRef> getSourceFileNameById(unsigned Id) const;
llvm::Optional<StringRef> getGroupNameForDecl(const Decl *D) const;
llvm::Optional<StringRef> getSourceFileNameForDecl(const Decl *D) const;
llvm::Optional<unsigned> getSourceOrderForDecl(const Decl *D) const;
std::optional<StringRef> getGroupNameById(unsigned Id) const;
std::optional<StringRef> getSourceFileNameById(unsigned Id) const;
std::optional<StringRef> getGroupNameForDecl(const Decl *D) const;
std::optional<StringRef> getSourceFileNameForDecl(const Decl *D) const;
std::optional<unsigned> getSourceOrderForDecl(const Decl *D) const;
void collectAllGroups(SmallVectorImpl<StringRef> &Names) const;
llvm::Optional<CommentInfo> getCommentForDecl(const Decl *D) const;
std::optional<CommentInfo> getCommentForDecl(const Decl *D) const;
bool hasLoadedSwiftDoc() const;
llvm::Optional<CommentInfo> getCommentForDeclByUSR(StringRef USR) const;
llvm::Optional<StringRef> getGroupNameByUSR(StringRef USR) const;
llvm::Optional<ExternalSourceLocs::RawLocs>
std::optional<CommentInfo> getCommentForDeclByUSR(StringRef USR) const;
std::optional<StringRef> getGroupNameByUSR(StringRef USR) const;
std::optional<ExternalSourceLocs::RawLocs>
getExternalRawLocsForDecl(const Decl *D) const;
Identifier getDiscriminatorForPrivateDecl(const Decl *D);
llvm::Optional<Fingerprint>
std::optional<Fingerprint>
loadFingerprint(const IterableDeclContext *IDC) const;
void collectBasicSourceFileInfo(
llvm::function_ref<void(const BasicSourceFileInfo &)> callback) const;
@@ -1055,20 +1055,20 @@ public:
SILLayout *readSILLayout(llvm::BitstreamCursor &Cursor);
/// Reads a foreign error convention from \c DeclTypeCursor, if present.
llvm::Optional<ForeignErrorConvention> maybeReadForeignErrorConvention();
std::optional<ForeignErrorConvention> maybeReadForeignErrorConvention();
/// Reads a foreign async convention from \c DeclTypeCursor, if present.
llvm::Optional<ForeignAsyncConvention> maybeReadForeignAsyncConvention();
std::optional<ForeignAsyncConvention> maybeReadForeignAsyncConvention();
bool maybeReadLifetimeDependence(
SmallVectorImpl<LifetimeDependenceSpecifier> &specifierList,
unsigned numParams);
/// Reads inlinable body text from \c DeclTypeCursor, if present.
llvm::Optional<StringRef> maybeReadInlinableBodyText();
std::optional<StringRef> maybeReadInlinableBodyText();
/// Reads pattern initializer text from \c DeclTypeCursor, if present.
llvm::Optional<StringRef> maybeReadPatternInitializerText();
std::optional<StringRef> maybeReadPatternInitializerText();
};
template <typename T, typename RawData>