Merge pull request #7307 from apple/revert-7256-dev/module.map-depr

Revert "[clang][modules] Deprecate module.map in favor of module.modulemap"

Author: shahmishal

clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp

@@ -1917,14 +1917,14 @@ TEST_F(SymbolCollectorTest, UndefOfModuleMacro) {
     #undef X
     )cpp";
   TU.AdditionalFiles["foo.h"] = "#define X 1";
-  TU.AdditionalFiles["module.modulemap"] = R"cpp(
+  TU.AdditionalFiles["module.map"] = R"cpp(
     module foo {
      header "foo.h"
      export *
    }
    )cpp";
   TU.ExtraArgs.push_back("-fmodules");
-  TU.ExtraArgs.push_back("-fmodule-map-file=" + testPath("module.modulemap"));
+  TU.ExtraArgs.push_back("-fmodule-map-file=" + testPath("module.map"));
   TU.OverlayRealFileSystemForModules = true;
 
   TU.build();

clang-tools-extra/docs/modularize.rst

@@ -51,20 +51,20 @@
 //          to the header list file directory.  Use -prefix to specify a
 //          different directory.
 //    -module-map-path=(module map)
-//          Skip the checks, and instead act as a module.modulemap generation
+//          Skip the checks, and instead act as a module.map generation
 //          assistant, generating a module map file based on the header list.
 //          An optional "-root-module=(rootName)" argument can specify a root
-//          module to be created in the generated module.modulemap file.  Note
-//          that you will likely need to edit this file to suit the needs of
-//          your headers.
+//          module to be created in the generated module.map file.  Note that
+//          you will likely need to edit this file to suit the needs of your
+//          headers.
 //    -problem-files-list=(problem files list file name)
 //          For use only with module map assistant.  Input list of files that
 //          have problems with respect to modules.  These will still be
 //          included in the generated module map, but will be marked as
 //          "excluded" headers.
 //    -root-module=(root module name)
-//          Specifies a root module to be created in the generated
-//          module.modulemap file.
+//          Specifies a root module to be created in the generated module.map
+//          file.
 //    -block-check-header-list-only
 //          Only warn if #include directives are inside extern or namespace
 //          blocks if the included header is in the header list.

clang-tools-extra/modularize/Modularize.cpp

@@ -103,10 +103,10 @@ std::error_code ModularizeUtilities::loadAllHeaderListsAndDependencies() {
 
 // Do coverage checks.
 // For each loaded module map, do header coverage check.
-// Starting from the directory of the module.modulemap file,
+// Starting from the directory of the module.map file,
 // Find all header files, optionally looking only at files
 // covered by the include path options, and compare against
-// the headers referenced by the module.modulemap file.
+// the headers referenced by the module.map file.
 // Display warnings for unaccounted-for header files.
 // Returns 0 if there were no errors or warnings, 1 if there
 // were warnings, 2 if any other problem, such as a bad

clang-tools-extra/modularize/ModularizeUtilities.cpp

@@ -89,10 +89,10 @@ class ModularizeUtilities {
 
   /// Do coverage checks.
   /// For each loaded module map, do header coverage check.
-  /// Starting from the directory of the module.modulemap file,
+  /// Starting from the directory of the module.map file,
   /// Find all header files, optionally looking only at files
   /// covered by the include path options, and compare against
-  /// the headers referenced by the module.modulemap file.
+  /// the headers referenced by the module.map file.
   /// Display warnings for unaccounted-for header files.
   /// \param IncludePaths The include paths to check for files.
   ///   (Note that other directories above these paths are ignored.

clang-tools-extra/modularize/ModularizeUtilities.h

@@ -1,4 +1,4 @@
-// module.modulemap
+// module.map
 
 module Level1A {
   header "Level1A.h"

clang-tools-extra/test/modularize/Inputs/CompileError/module.modulemap

@@ -1,4 +1,4 @@
-// module.modulemap
+// module.map
 
 module Level1A {
   header "Includes1/Level1A.h"

clang-tools-extra/test/modularize/Inputs/CoverageNoProblems/module.modulemap

@@ -1,4 +1,4 @@
-// module.modulemap
+// module.map
 
 module Level1A {
   header "Level1A.h"

clang-tools-extra/test/modularize/Inputs/CoverageProblems/module.modulemap

@@ -1,4 +1,4 @@
-// module.modulemap
+// module.map
 
 module Level1A {
   header "Level1A.h"

clang-tools-extra/test/modularize/Inputs/MissingHeader/module.modulemap

@@ -1,4 +1,4 @@
-// module.modulemap
+// module.map
 
 module Level1A {
   header "Level1A.h"