Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit d4d74e2fb47e · 2018-11-28T15:49:51.000-08:00
diff --git a/tools/swift-api-digester/swift-api-digester.cpp b/tools/swift-api-digester/swift-api-digester.cpp
@@ -2192,8 +2192,11 @@ static int readFileLineByLine(StringRef Path, llvm::StringSet<> &Lines) {
     StringRef Line;
     std::tie(Line, BufferText) = BufferText.split('\n');
     Line = Line.trim();
-    if (!Line.empty())
-      Lines.insert(Line);
+    if (Line.empty())
+      continue;
+    if (Line.startswith("// ")) // comment.
+      continue;
+    Lines.insert(Line);
   }
   return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -2192,8 +2192,11 @@ static int readFileLineByLine(StringRef Path, llvm::StringSet<> &Lines) {`
`2192`	`2192`	`StringRef Line;`
`2193`	`2193`	`std::tie(Line, BufferText) = BufferText.split('\n');`
`2194`	`2194`	`Line = Line.trim();`
`2195`		`- if (!Line.empty())`
`2196`		`- Lines.insert(Line);`
	`2195`	`+ if (Line.empty())`
	`2196`	`+ continue;`
	`2197`	`+ if (Line.startswith("// ")) // comment.`
	`2198`	`+ continue;`
	`2199`	`+ Lines.insert(Line);`
`2197`	`2200`	`}`
`2198`	`2201`	`return 0;`
`2199`	`2202`	`}`