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

9
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -334,7 +334,6 @@ struct ModuleRebuildInfo {
/// normal cache, the prebuilt cache, a module adjacent to the interface, or
/// a module that we'll build from a module interface.
class ModuleInterfaceLoaderImpl {
using AccessPathElem = Located<Identifier>;
friend class swift::ModuleInterfaceLoader;
ASTContext &ctx;
llvm::vfs::FileSystem &fs;
@@ -953,7 +952,7 @@ bool ModuleInterfaceLoader::isCached(StringRef DepPath) {
/// cache or by converting it in a subordinate \c CompilerInstance, caching
/// the results.
std::error_code ModuleInterfaceLoader::findModuleFilesInDirectory(
AccessPathElem ModuleID,
ImportPath::Element ModuleID,
const SerializedModuleBaseName &BaseName,
SmallVectorImpl<char> *ModuleInterfacePath,
std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
@@ -1520,7 +1519,7 @@ ExplicitSwiftModuleLoader::ExplicitSwiftModuleLoader(
ExplicitSwiftModuleLoader::~ExplicitSwiftModuleLoader() { delete &Impl; }
bool ExplicitSwiftModuleLoader::findModule(AccessPathElem ModuleID,
bool ExplicitSwiftModuleLoader::findModule(ImportPath::Element ModuleID,
SmallVectorImpl<char> *ModuleInterfacePath,
std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer,
@@ -1596,7 +1595,7 @@ bool ExplicitSwiftModuleLoader::findModule(AccessPathElem ModuleID,
}
std::error_code ExplicitSwiftModuleLoader::findModuleFilesInDirectory(
AccessPathElem ModuleID,
ImportPath::Element ModuleID,
const SerializedModuleBaseName &BaseName,
SmallVectorImpl<char> *ModuleInterfacePath,
std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
@@ -1608,7 +1607,7 @@ std::error_code ExplicitSwiftModuleLoader::findModuleFilesInDirectory(
}
bool ExplicitSwiftModuleLoader::canImportModule(
Located<Identifier> mID) {
ImportPath::Element mID) {
StringRef moduleName = mID.Item.str();
auto it = Impl.ExplicitModuleMap.find(moduleName);
// If no provided explicit module matches the name, then it cannot be imported.