Skip to content

[NFC] Rename MissingImport cases and tests #61190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/swift/AST/SourceFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class PersistentParserState;
///
/// \sa getRestrictedImportKind
enum class RestrictedImportKind {
Implicit,
MissingImport,
ImplementationOnly,
SPIOnly,
None // No restriction, i.e. the module is imported publicly.
Expand Down
4 changes: 2 additions & 2 deletions lib/AST/Module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2596,7 +2596,7 @@ bool SourceFile::hasTestableOrPrivateImport(

RestrictedImportKind SourceFile::getRestrictedImportKind(const ModuleDecl *module) const {
auto &imports = getASTContext().getImportCache();
RestrictedImportKind importKind = RestrictedImportKind::Implicit;
RestrictedImportKind importKind = RestrictedImportKind::MissingImport;

// Workaround for the cases where the bridging header isn't properly
// imported implicitly.
Expand Down Expand Up @@ -2624,7 +2624,7 @@ RestrictedImportKind SourceFile::getRestrictedImportKind(const ModuleDecl *modul
if (imports.isImportedBy(module, getParentModule()))
return RestrictedImportKind::None;

if (importKind == RestrictedImportKind::Implicit &&
if (importKind == RestrictedImportKind::MissingImport &&
(module->getLibraryLevel() == LibraryLevel::API ||
getParentModule()->getLibraryLevel() != LibraryLevel::API)) {
// Hack to fix swiftinterfaces in case of missing imports.
Expand Down
10 changes: 5 additions & 5 deletions lib/Sema/ResilienceDiagnostics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ static bool diagnoseTypeAliasDeclRefExportability(SourceLoc loc,
}
D->diagnose(diag::kind_declared_here, DescriptiveDeclKind::Type);

if (originKind == DisallowedOriginKind::ImplicitlyImported &&
if (originKind == DisallowedOriginKind::MissingImport &&
!ctx.LangOpts.isSwiftVersionAtLeast(6))
ctx.Diags.diagnose(loc, diag::missing_import_inserted,
definingModule->getName());
Expand Down Expand Up @@ -187,7 +187,7 @@ static bool diagnoseValueDeclRefExportability(SourceLoc loc, const ValueDecl *D,
// Only implicitly imported decls should be reported as a warning,
// and only for language versions below Swift 6.
assert(downgradeToWarning == DowngradeToWarning::No ||
originKind == DisallowedOriginKind::ImplicitlyImported &&
originKind == DisallowedOriginKind::MissingImport &&
"Only implicitly imported decls should be reported as a warning.");
auto errorOrWarning = downgradeToWarning == DowngradeToWarning::Yes?
diag::inlinable_decl_ref_from_hidden_module_warn:
Expand All @@ -198,7 +198,7 @@ static bool diagnoseValueDeclRefExportability(SourceLoc loc, const ValueDecl *D,
fragileKind.getSelector(), definingModule->getName(),
static_cast<unsigned>(originKind));

if (originKind == DisallowedOriginKind::ImplicitlyImported &&
if (originKind == DisallowedOriginKind::MissingImport &&
downgradeToWarning == DowngradeToWarning::Yes)
ctx.Diags.diagnose(loc, diag::missing_import_inserted,
definingModule->getName());
Expand Down Expand Up @@ -257,10 +257,10 @@ TypeChecker::diagnoseConformanceExportability(SourceLoc loc,
.warnUntilSwiftVersionIf((useConformanceAvailabilityErrorsOption &&
!ctx.LangOpts.EnableConformanceAvailabilityErrors &&
originKind != DisallowedOriginKind::SPIOnly) ||
originKind == DisallowedOriginKind::ImplicitlyImported,
originKind == DisallowedOriginKind::MissingImport,
6);

if (originKind == DisallowedOriginKind::ImplicitlyImported &&
if (originKind == DisallowedOriginKind::MissingImport &&
!ctx.LangOpts.isSwiftVersionAtLeast(6))
ctx.Diags.diagnose(loc, diag::missing_import_inserted,
M->getName());
Expand Down
6 changes: 3 additions & 3 deletions lib/Sema/TypeCheckAccess.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1554,7 +1554,7 @@ swift::getDisallowedOriginKind(const Decl *decl,
// Before Swift 6, implicit imports were not reported unless an
// implementation-only import was also present. Downgrade to a warning
// just in this case.
if (howImported == RestrictedImportKind::Implicit &&
if (howImported == RestrictedImportKind::MissingImport &&
!SF->getASTContext().isSwiftVersionAtLeast(6) &&
!SF->hasImportsWithFlag(ImportFlags::ImplementationOnly)) {
downgradeToWarning = DowngradeToWarning::Yes;
Expand Down Expand Up @@ -1600,8 +1600,8 @@ swift::getDisallowedOriginKind(const Decl *decl,

// Restrictively imported, cannot be reexported.
switch (howImported) {
case RestrictedImportKind::Implicit:
return DisallowedOriginKind::ImplicitlyImported;
case RestrictedImportKind::MissingImport:
return DisallowedOriginKind::MissingImport;
case RestrictedImportKind::SPIOnly:
return DisallowedOriginKind::SPIOnly;
case RestrictedImportKind::ImplementationOnly:
Expand Down
2 changes: 1 addition & 1 deletion lib/Sema/TypeCheckAccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ enum class DisallowedOriginKind : uint8_t {
SPIImported,
SPILocal,
SPIOnly,
ImplicitlyImported,
MissingImport,
None
};

Expand Down