fmt

Author: David Ungar

include/swift/Driver/SourceComparator.h

@@ -97,7 +97,7 @@ class SourceComparator {
   struct LineIndices : public Indices<LineIndices> {
     LineIndices() : Indices(~0, ~0) {}
     LineIndices(size_t lhs, size_t rhs) : Indices(lhs, rhs) {}
-    LineIndices & operator=(const LineIndices&) = default;
+    LineIndices &operator=(const LineIndices &) = default;
     LineIndices &operator++() {
       ++lhs(), ++rhs();
       return *this;
@@ -214,7 +214,8 @@ class SourceComparator {
   struct PRLink {
     LineIndices lines;
     Optional<size_t> next;
-    PRLink(LineIndices lines, const Optional<size_t> next) : lines(lines), next(next) {}
+    PRLink(LineIndices lines, const Optional<size_t> next)
+        : lines(lines), next(next) {}
     PRLink() : PRLink(LineIndices(), None) {}
   };
 
@@ -271,13 +272,11 @@ class SourceComparator {
   std::unordered_map<std::string, std::vector<size_t>>
   buildEquivalenceClasses();
 
-
-  std::pair<std::vector<PRLink>, SortedSequence>
-  buildDAGOfSubsequences(
+  std::pair<std::vector<PRLink>, SortedSequence> buildDAGOfSubsequences(
       std::unordered_map<std::string, std::vector<size_t>> rhsMap);
 
-  void scanMatchedLines(std::pair<std::vector<PRLink>,
-                                  SortedSequence> &&linksAndThres);
+  void scanMatchedLines(
+      std::pair<std::vector<PRLink>, SortedSequence> &&linksAndThres);
 
   //==============================================================================
   // MARK: summarizing

lib/Driver/Compilation.cpp

@@ -1967,8 +1967,7 @@ void Compilation::disableIncrementalBuild(Twine why) {
 }
 
 void Compilation::IncrementalSchemeComparator::update(
-    const CommandSet &depJobs,
-    const CommandSet &rangeJobs,
+    const CommandSet &depJobs, const CommandSet &rangeJobs,
     const CommandSet &lackingSuppJobs) {
   for (const auto *cmd : depJobs)
     DependencyCompileJobs.insert(cmd);
@@ -2018,22 +2017,26 @@ void Compilation::IncrementalSchemeComparator::outputComparison(
   }
   unsigned depsCount = DependencyCompileJobs.size();
   unsigned rangesCount =
-      UseSourceRangeDependencies ? SourceRangeCompileJobs.size()
-                                 : depsCount +
-                                       additionalDependencyJobsToCreateSupps;
+      UseSourceRangeDependencies
+          ? SourceRangeCompileJobs.size()
+          : depsCount + additionalDependencyJobsToCreateSupps;
 
-  const bool fellBack = EnableSourceRangeDependencies && !UseSourceRangeDependencies;
+  const bool fellBack =
+      EnableSourceRangeDependencies && !UseSourceRangeDependencies;
 
   const int rangeBenefit = depsCount - rangesCount;
-  const int rangeStageBenefit = DependencyCompileStages - SourceRangeCompileStages;
+  const int rangeStageBenefit =
+      DependencyCompileStages - SourceRangeCompileStages;
 
   out << "*** "
       << "Range benefit: " << rangeBenefit << " compilations, "
       << rangeStageBenefit << " stages, "
       << "deps: " << depsCount << ", "
-      << "ranges" << (fellBack ? " (falling back)" : "") << ": " << rangesCount << ", "
+      << "ranges" << (fellBack ? " (falling back)" : "") << ": " << rangesCount
+      << ", "
       << "total: " << SwiftInputCount << ", "
-      << "requested: " << (EnableSourceRangeDependencies ? "ranges" : "deps") << ", "
+      << "requested: " << (EnableSourceRangeDependencies ? "ranges" : "deps")
+      << ", "
       << "used: " << (UseSourceRangeDependencies ? "ranges" : "deps")
       << "***\n";
 }

lib/Driver/SourceComparator.cpp

@@ -74,7 +74,6 @@ SourceComparator::buildEquivalenceClasses() {
   return rhsMap;
 }
 
-
 std::pair<std::vector<SourceComparator::PRLink>,
           SourceComparator::SortedSequence>
 SourceComparator::buildDAGOfSubsequences(
@@ -113,16 +112,14 @@ SourceComparator::buildDAGOfSubsequences(
 }
 
 void SourceComparator::scanMatchedLines(
-    std::pair<std::vector<PRLink>, SortedSequence>
-        &&linksAndThres) {
+    std::pair<std::vector<PRLink>, SortedSequence> &&linksAndThres) {
   const auto &links = linksAndThres.first;
   const auto &thresh = linksAndThres.second;
 
   if (thresh.empty())
     return;
   // For every match put rhs index in matches[col2 index]
-  for (const auto *p = &links[thresh.size() - 1];
-       p;
+  for (const auto *p = &links[thresh.size() - 1]; p;
        p = p->next ? &links[p->next.getValue()] : nullptr)
     matches[p->lines.lhs()] = p->lines.rhs();
 }