Merge pull request #61190 from xymus/rename-missing-import

[NFC] Rename MissingImport cases and tests

Author: xymus

include/swift/AST/SourceFile.h

@@ -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.

lib/AST/Module.cpp

@@ -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.
@@ -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.

lib/Sema/ResilienceDiagnostics.cpp

@@ -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());
@@ -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:
@@ -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());
@@ -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());

lib/Sema/TypeCheckAccess.cpp

@@ -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;
@@ -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:

lib/Sema/TypeCheckAccess.h

@@ -45,7 +45,7 @@ enum class DisallowedOriginKind : uint8_t {
   SPIImported,
   SPILocal,
   SPIOnly,
-  ImplicitlyImported,
+  MissingImport,
   None
 };