Minor improvements to file_types

No intended functionality change.

Author: jrose-apple

include/swift/Basic/FileTypes.h

@@ -15,8 +15,8 @@
 
 #include "swift/Basic/LLVM.h"
 #include "llvm/ADT/DenseMapInfo.h"
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringRef.h"
-#include <functional>
 
 namespace swift {
 namespace file_types {
@@ -58,8 +58,12 @@ bool isAfterLLVM(ID Id);
 /// These need to be passed to the Swift frontend
 bool isPartOfSwiftCompilation(ID Id);
 
-template <typename Fn> void forAllTypes(const Fn &fn);
-} // namespace file_types
+static inline void forAllTypes(llvm::function_ref<void(file_types::ID)> fn) {
+  for (uint8_t i = 0; i < static_cast<uint8_t>(TY_INVALID); ++i)
+    fn(static_cast<ID>(i));
+}
+
+} // end namespace file_types
 } // end namespace swift
 
 namespace llvm {
@@ -72,14 +76,6 @@ template <> struct DenseMapInfo<swift::file_types::ID> {
   static unsigned getHashValue(ID Val) { return (unsigned)Val * 37U; }
   static bool isEqual(ID LHS, ID RHS) { return LHS == RHS; }
 };
-} // namespace llvm
-
-template <typename Fn> void swift::file_types::forAllTypes(const Fn &fn) {
-  static_assert(
-      std::is_constructible<std::function<void(file_types::ID)>, Fn>::value,
-      "must have the signature 'void(file_types::ID)'");
-  for (uint8_t i = 0; i < static_cast<uint8_t>(TY_INVALID); ++i)
-    fn(static_cast<ID>(i));
-}
+} // end namespace llvm
 
 #endif

lib/Basic/FileTypes.cpp

@@ -20,15 +20,17 @@
 using namespace swift;
 using namespace swift::file_types;
 
+namespace {
 struct TypeInfo {
   const char *Name;
   const char *Flags;
   const char *Extension;
 };
+} // end anonymous namespace
 
 static const TypeInfo TypeInfos[] = {
-#define TYPE(NAME, ID, TEMP_SUFFIX, FLAGS) \
-  { NAME, FLAGS, TEMP_SUFFIX },
+#define TYPE(NAME, ID, EXTENSION, FLAGS) \
+  { NAME, FLAGS, EXTENSION },
 #include "swift/Basic/FileTypes.def"
 };
 
@@ -48,15 +50,15 @@ ID file_types::lookupTypeForExtension(StringRef Ext) {
     return TY_INVALID;
   assert(Ext.front() == '.' && "not a file extension");
   return llvm::StringSwitch<file_types::ID>(Ext.drop_front())
-#define TYPE(NAME, ID, SUFFIX, FLAGS) \
-           .Case(SUFFIX, TY_##ID)
+#define TYPE(NAME, ID, EXTENSION, FLAGS) \
+           .Case(EXTENSION, TY_##ID)
 #include "swift/Basic/FileTypes.def"
       .Default(TY_INVALID);
 }
 
 ID file_types::lookupTypeForName(StringRef Name) {
   return llvm::StringSwitch<file_types::ID>(Name)
-#define TYPE(NAME, ID, SUFFIX, FLAGS) \
+#define TYPE(NAME, ID, EXTENSION, FLAGS) \
            .Case(NAME, TY_##ID)
 #include "swift/Basic/FileTypes.def"
       .Default(TY_INVALID);