diff options
| -rw-r--r-- | clang-tools-extra/clang-tidy/ClangTidy.cpp | 5 | ||||
| -rw-r--r-- | clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp | 2 | 
2 files changed, 3 insertions, 4 deletions
diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp index 205a7027e5a..0b9895bcf17 100644 --- a/clang-tools-extra/clang-tidy/ClangTidy.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp @@ -114,9 +114,8 @@ public:      SmallVector<std::pair<SourceLocation, bool>, 4> FixLocations;      {        auto Level = static_cast<DiagnosticsEngine::Level>(Error.DiagLevel); -      DiagnosticBuilder Diag = -          Diags.Report(Loc, Diags.getCustomDiagID(Level, "%0 [%1]")) -          << Message.Message << Error.CheckName; +      auto Diag = Diags.Report(Loc, Diags.getCustomDiagID(Level, "%0 [%1]")) +                  << Message.Message << Error.CheckName;        for (const tooling::Replacement &Fix : Error.Fix) {          SourceLocation FixLoc = getLocation(Fix.getFilePath(), Fix.getOffset());          SourceLocation FixEndLoc = FixLoc.getLocWithOffset(Fix.getLength()); diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp index a3e5701121e..e6c181273b4 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp @@ -132,7 +132,7 @@ static bool ConsumeNegativeIndicator(StringRef &GlobList) {  static llvm::Regex ConsumeGlob(StringRef &GlobList) {    StringRef Glob = GlobList.substr(0, GlobList.find(',')).trim();    GlobList = GlobList.substr(Glob.size() + 1); -  llvm::SmallString<128> RegexText("^"); +  SmallString<128> RegexText("^");    StringRef MetaChars("()^$|*+?.[]\\{}");    for (char C : Glob) {      if (C == '*')  | 

