Merge pull request #33986 from varungandhi-apple/vg-import-filter-cleanup

[NFC] Clarify import filtering logic and naming.
This commit is contained in:
Varun Gandhi
2020-09-23 18:23:11 -07:00
committed by GitHub
23 changed files with 127 additions and 78 deletions

View File

@@ -427,7 +427,7 @@ void ModuleFile::getImportedModules(
for (auto &dep : Dependencies) {
if (dep.isExported()) {
if (!filter.contains(ModuleDecl::ImportFilterKind::Public))
if (!filter.contains(ModuleDecl::ImportFilterKind::Exported))
continue;
} else if (dep.isImplementationOnly()) {
@@ -440,7 +440,7 @@ void ModuleFile::getImportedModules(
}
} else {
if (!filter.contains(ModuleDecl::ImportFilterKind::Private))
if (!filter.contains(ModuleDecl::ImportFilterKind::Default))
continue;
}