Author: Salman Javed Date: 2021-11-13T00:01:12+13:00 New Revision: 9089a1dff030dbcf48f2bdae6d2d80e7ddfca25a
URL: https://github.com/llvm/llvm-project/commit/9089a1dff030dbcf48f2bdae6d2d80e7ddfca25a DIFF: https://github.com/llvm/llvm-project/commit/9089a1dff030dbcf48f2bdae6d2d80e7ddfca25a.diff LOG: [clang-tidy] Re-apply 0076957 with fix for failing ASan tests Re-apply "Fix lint warning in ClangTidyDiagnosticConsumer.cpp (NFC)" with fixes for the failing ASan tests. This reverts commit 74add1b6d6d377ab2cdce26699cf798110817e42. Added: Modified: clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp index 456de0e979db..dd590f7c79fb 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp @@ -376,10 +376,10 @@ static ClangTidyError createNolintError(const ClangTidyContext &Context, Context.getCurrentBuildDirectory(), false); StringRef Message = IsNolintBegin - ? "unmatched 'NOLINTBEGIN' comment without a subsequent 'NOLINTEND' " - "comment" - : "unmatched 'NOLINTEND' comment without a previous 'NOLINTBEGIN' " - "comment"; + ? ("unmatched 'NOLINTBEGIN' comment without a subsequent 'NOLINT" + "END' comment") + : ("unmatched 'NOLINTEND' comment without a previous 'NOLINT" + "BEGIN' comment"); Error.Message = tooling::DiagnosticMessage(Message, SM, Loc); return Error; } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
