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

[NFC] Adopt new ImportPath types and terminology

Browse Source 
# Conflicts:
#	lib/IDE/CodeCompletion.cpp
This commit is contained in:
Brent Royal-Gordon
2020-09-10 19:05:40 -07:00
parent 1ed3caece6
commit cff4ddf13a
52 changed files with 375 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/swift/Frontend/ModuleInterfaceLoader.h
View File

@@ -134,7 +134,7 @@ class ExplicitSwiftModuleLoader: public SerializedModuleLoaderBase {
ModuleLoadingMode loadMode,
bool IgnoreSwiftSourceInfoFile);
bool findModule(AccessPathElem moduleID,
bool findModule(ImportPath::Element moduleID,
SmallVectorImpl<char> *moduleInterfacePath,
std::unique_ptr<llvm::MemoryBuffer> *moduleBuffer,
std::unique_ptr<llvm::MemoryBuffer> *moduleDocBuffer,
@@ -142,7 +142,7 @@ class ExplicitSwiftModuleLoader: public SerializedModuleLoaderBase {
bool &isFramework, bool &isSystemModule) override;
std::error_code findModuleFilesInDirectory(
AccessPathElem ModuleID,
ImportPath::Element ModuleID,
const SerializedModuleBaseName &BaseName,
SmallVectorImpl<char> *ModuleInterfacePath,
std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
@@ -150,7 +150,7 @@ class ExplicitSwiftModuleLoader: public SerializedModuleLoaderBase {
std::unique_ptr<llvm::MemoryBuffer> *ModuleSourceInfoBuffer,
bool IsFramework) override;
bool canImportModule(Located<Identifier> mID) override;
bool canImportModule(ImportPath::Element mID) override;
bool isCached(StringRef DepPath) override { return false; };
@@ -332,7 +332,7 @@ class ModuleInterfaceLoader : public SerializedModuleLoaderBase {
ModuleInterfaceLoaderOptions Opts;
std::error_code findModuleFilesInDirectory(
AccessPathElem ModuleID,
ImportPath::Element ModuleID,
const SerializedModuleBaseName &BaseName,
SmallVectorImpl<char> *ModuleInterfacePath,
std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,