Swift: tweak after review comments

redsun82 · redsun82 · commit 7ce1189e3696 · 2023-05-04T15:14:46.000+02:00
diff --git a/swift/logging/SwiftDiagnostics.cpp b/swift/logging/SwiftDiagnostics.cpp
@@ -45,7 +45,7 @@ std::string SwiftDiagnosticsSource::sourceId() const {
   std::replace(ret.begin(), ret.end(), '_', '-');
   return ret;
 }
-void SwiftDiagnosticsSource::inscribeImpl(const SwiftDiagnosticsSource* source) {
+void SwiftDiagnosticsSource::registerImpl(const SwiftDiagnosticsSource* source) {
   auto [it, inserted] = map().emplace(source->id, source);
   CODEQL_ASSERT(inserted, "duplicate diagnostics source detected with id {}", source->id);
 }
diff --git a/swift/logging/SwiftDiagnostics.h b/swift/logging/SwiftDiagnostics.h
@@ -23,15 +23,17 @@ struct SwiftDiagnosticsSource {
   std::string_view name;
   static constexpr std::string_view extractorName = "swift";
   std::string_view action;
-  std::string_view helpLinks;  // space separated if more than 1. Not a vector to allow constexpr
+  // space separated if more than 1. Not a vector to allow constexpr
+  // TODO(C++20) with vector going constexpr this can be turned to `std::vector<std::string_view>`
+  std::string_view helpLinks;
 
   // for the moment, we only output errors, so no need to store the severity
 
   // registers a diagnostics source for later retrieval with get, if not done yet
-  template <const SwiftDiagnosticsSource* Spec>
-  static void inscribe() {
+  template <const SwiftDiagnosticsSource* Source>
+  static void ensureRegistered() {
     static std::once_flag once;
-    std::call_once(once, inscribeImpl, Spec);
+    std::call_once(once, registerImpl, Source);
   }
 
   // gets a previously inscribed SwiftDiagnosticsSource for the given id. Will abort if none exists
@@ -44,7 +46,7 @@ struct SwiftDiagnosticsSource {
   void emit(std::ostream& out, std::string_view timestamp, std::string_view message) const;
 
  private:
-  static void inscribeImpl(const SwiftDiagnosticsSource* Spec);
+  static void registerImpl(const SwiftDiagnosticsSource* source);
 
   std::string sourceId() const;
   using Map = std::unordered_map<std::string, const SwiftDiagnosticsSource*>;

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ std::string SwiftDiagnosticsSource::sourceId() const {`
`45`	`45`	`std::replace(ret.begin(), ret.end(), '_', '-');`
`46`	`46`	`return ret;`
`47`	`47`	`}`
`48`		`-void SwiftDiagnosticsSource::inscribeImpl(const SwiftDiagnosticsSource* source) {`
	`48`	`+void SwiftDiagnosticsSource::registerImpl(const SwiftDiagnosticsSource* source) {`
`49`	`49`	`auto [it, inserted] = map().emplace(source->id, source);`
`50`	`50`	`CODEQL_ASSERT(inserted, "duplicate diagnostics source detected with id {}", source->id);`
`51`	`51`	`}`