diff --git a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp index bc2ecc6b5455..1efe35a8b8f0 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp @@ -157,14 +157,12 @@ static void mapChecks(IO &IO, std::optional &Checks) { template <> struct MappingTraits { static void mapping(IO &IO, ClangTidyOptions &Options) { - bool Ignored = false; mapChecks(IO, Options.Checks); IO.mapOptional("WarningsAsErrors", Options.WarningsAsErrors); IO.mapOptional("HeaderFileExtensions", Options.HeaderFileExtensions); IO.mapOptional("ImplementationFileExtensions", Options.ImplementationFileExtensions); IO.mapOptional("HeaderFilterRegex", Options.HeaderFilterRegex); - IO.mapOptional("AnalyzeTemporaryDtors", Ignored); // deprecated IO.mapOptional("FormatStyle", Options.FormatStyle); IO.mapOptional("User", Options.User); IO.mapOptional("CheckOptions", Options.CheckOptions); diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst index 159366222844..d22287d4effe 100644 --- a/clang-tools-extra/docs/ReleaseNotes.rst +++ b/clang-tools-extra/docs/ReleaseNotes.rst @@ -108,6 +108,9 @@ Improvements to clang-tidy functionality using the newly added command line option `--enable-module-headers-parsing`. +- Remove configuration option `AnalyzeTemporaryDestructors`, which was deprecated since + :program:`clang-tidy` 16. + New checks ^^^^^^^^^^ diff --git a/clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp b/clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp index 89d8f4400fca..af4f66ae3c54 100644 --- a/clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp +++ b/clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp @@ -81,7 +81,6 @@ TEST(ParseConfiguration, ValidConfiguration) { "HeaderFileExtensions: [\"\",\"h\",\"hh\",\"hpp\",\"hxx\"]\n" "ImplementationFileExtensions: [\"c\",\"cc\",\"cpp\",\"cxx\"]\n" "HeaderFilterRegex: \".*\"\n" - "AnalyzeTemporaryDtors: true\n" "User: some.user", "Options")); EXPECT_TRUE(!!Options); @@ -115,7 +114,6 @@ TEST(ParseConfiguration, MergeConfigurations) { HeaderFileExtensions: ["h","hh"] ImplementationFileExtensions: ["c","cc"] HeaderFilterRegex: "filter1" - AnalyzeTemporaryDtors: true User: user1 ExtraArgs: ['arg1', 'arg2'] ExtraArgsBefore: ['arg-before1', 'arg-before2'] @@ -130,7 +128,6 @@ TEST(ParseConfiguration, MergeConfigurations) { HeaderFileExtensions: ["hpp","hxx"] ImplementationFileExtensions: ["cpp","cxx"] HeaderFilterRegex: "filter2" - AnalyzeTemporaryDtors: false User: user2 ExtraArgs: ['arg3', 'arg4'] ExtraArgsBefore: ['arg-before3', 'arg-before4']