[clang-tidy] Merge options inplace instead of copying
authorNathan James <n.james93@hotmail.co.uk>
Thu, 12 Nov 2020 18:19:11 +0000 (18:19 +0000)
committerNathan James <n.james93@hotmail.co.uk>
Thu, 12 Nov 2020 18:19:12 +0000 (18:19 +0000)
commit06db8f984f1a31e299af7d9ea584061d244caad6
tree350a8940a5822ca24ebdbdef64e0c4638c8df94f
parentb336826c1dd92adabef682f9b013b2e36bce066c
[clang-tidy] Merge options inplace instead of copying

Changed `ClangTidyOptions::mergeWith` to operate on the instance instead of returning a copy. The old mergeWith method has been renamed to merge and marked as nodiscard, to aid in disambiguating which one is which.

Reviewed By: aaron.ballman

Differential Revision: https://reviews.llvm.org/D91184
clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
clang-tools-extra/clang-tidy/ClangTidyOptions.h
clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp