Merge remote-tracking branch 'origin/main' into next

This commit is contained in:
swift_jenkins
2020-09-29 23:14:40 -07:00
324 changed files with 4436 additions and 2609 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;
}