[NFC] Improve simple_display for AttributedImport

Author: beccadax

include/swift/AST/Import.h

@@ -570,13 +570,27 @@ struct AttributedImport {
   }
 };
 
-/// A module which has been implicitly imported.
 void simple_display(llvm::raw_ostream &out,
-                    const AttributedImport<ImportedModule> &import);
+                    const ImportedModule &import);
 
-/// A module which will be implicitly imported.
 void simple_display(llvm::raw_ostream &out,
-                    const AttributedImport<UnloadedImportedModule> &import);
+                    const UnloadedImportedModule &import);
+
+// This is a quasi-implementation detail of the template version below.
+void simple_display(llvm::raw_ostream &out,
+                    const AttributedImport<std::tuple<>> &import);
+
+template<typename ModuleInfo>
+void simple_display(llvm::raw_ostream &out,
+                    const AttributedImport<ModuleInfo> &import) {
+  // Print the module.
+  simple_display(out, import.module);
+
+  // Print the other details of the import, using the std::tuple<>
+  // specialization.
+  AttributedImport<std::tuple<>> importWithoutModule({}, import);
+  simple_display(out, importWithoutModule);
+}
 
 // MARK: - Implicit imports
 

lib/AST/TypeCheckRequests.cpp

@@ -1392,49 +1392,30 @@ TypeCheckFunctionBodyRequest::readDependencySource(
 //----------------------------------------------------------------------------//
 
 void swift::simple_display(llvm::raw_ostream &out,
-                           const AttributedImport<ImportedModule> &import) {
+                           const ImportedModule &module) {
   out << "import of ";
-
-  simple_display(out, import.module.importedModule);
-
-  out << " [";
-  if (!import.module.accessPath.empty()) {
-    out << " scoped(";
-    import.module.accessPath.print(out);
-    out << ")";
+  if (!module.accessPath.empty()) {
+    module.accessPath.print(out);
+    out << " in ";
   }
-  if (import.options.contains(ImportFlags::Exported))
-    out << " exported";
-  if (import.options.contains(ImportFlags::Testable))
-    out << " testable";
-  if (import.options.contains(ImportFlags::ImplementationOnly))
-    out << " implementation-only";
-  if (import.options.contains(ImportFlags::PrivateImport))
-    out << " private(" << import.sourceFileArg << ")";
+  simple_display(out, module.importedModule);
+}
 
-  if (import.options.contains(ImportFlags::SPIAccessControl)) {
-    out << " spi(";
-    llvm::interleaveComma(import.spiGroups, out, [&out](Identifier name) {
-                                                   simple_display(out, name);
-                                                 });
-    out << ")";
+void swift::simple_display(llvm::raw_ostream &out,
+                           const UnloadedImportedModule &module) {
+  out << "import of ";
+  if (!module.getAccessPath().empty()) {
+    module.getAccessPath().print(out);
+    out << " in ";
   }
-
-  out << " ]";
+  out << "unloaded ";
+  module.getModulePath().print(out);
 }
 
 void swift::simple_display(llvm::raw_ostream &out,
-                       const AttributedImport<UnloadedImportedModule> &import) {
-  out << "import of unloaded ";
-
-  import.module.getModulePath().print(out);
-
+                           const AttributedImport<std::tuple<>> &import) {
   out << " [";
-  if (!import.module.getAccessPath().empty()) {
-    out << " scoped(";
-    import.module.getAccessPath().print(out);
-    out << ")";
-  }
+
   if (import.options.contains(ImportFlags::Exported))
     out << " exported";
   if (import.options.contains(ImportFlags::Testable))