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

6
lib/FrontendTool/ImportedModules.cpp
View File

@@ -66,9 +66,9 @@ bool swift::emitImportedModules(ModuleDecl *mainModule,
if (!ID)
continue;
auto accessPath = ID->getModulePath();
auto modulePath = ID->getModulePath();
// only the top-level name is needed (i.e. A in A.B.C)
Modules.insert(accessPath[0].Item.str());
Modules.insert(modulePath[0].Item.str());
}
// And now look in the C code we're possibly using.
@@ -97,7 +97,7 @@ bool swift::emitImportedModules(ModuleDecl *mainModule,
if (opts.ImportUnderlyingModule) {
auto underlyingModule = clangImporter->loadModule(SourceLoc(),
{ Located<Identifier>(mainModule->getName(), SourceLoc()) });
ImportPath::Module::Builder(mainModule->getName()).get());
if (!underlyingModule) {
Context.Diags.diagnose(SourceLoc(),
diag::error_underlying_module_not_found,