[all-commits] [llvm/llvm-project] 06db8f: [clang-tidy] Merge options inplace instead of copying

[Nathan James via All-commits]

  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: 06db8f984f1a31e299af7d9ea584061d244caad6
      https://github.com/llvm/llvm-project/commit/06db8f984f1a31e299af7d9ea584061d244caad6
  Author: Nathan James <n.james93 at hotmail.co.uk>
  Date:   2020-11-12 (Thu, 12 Nov 2020)

  Changed paths:
    M clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
    M clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
    M clang-tools-extra/clang-tidy/ClangTidyOptions.h
    M clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
    M clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp

  Log Message:
  -----------
  [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