diff --git a/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-startswith.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-startswith.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-startswith.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-startswith.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s abseil-string-find-startswith %t -- \ -// RUN: -config="{CheckOptions: [{key: 'abseil-string-find-startswith.StringLikeClasses', value: '::std::basic_string;::basic_string'}]}" +// RUN: -config="{CheckOptions: {abseil-string-find-startswith.StringLikeClasses: '::std::basic_string;::basic_string'}}" using size_t = decltype(sizeof(int)); diff --git a/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-str-contains.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-str-contains.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-str-contains.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-str-contains.cpp @@ -1,5 +1,4 @@ -// RUN: %check_clang_tidy %s abseil-string-find-str-contains %t -- \ -// RUN: -config="{CheckOptions: []}" +// RUN: %check_clang_tidy %s abseil-string-find-str-contains %t -- using size_t = decltype(sizeof(int)); diff --git a/clang-tools-extra/test/clang-tidy/checkers/altera/single-work-item-barrier.cpp b/clang-tools-extra/test/clang-tidy/checkers/altera/single-work-item-barrier.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/altera/single-work-item-barrier.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/altera/single-work-item-barrier.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy -check-suffix=OLDCLOLDAOC %s altera-single-work-item-barrier %t -- -header-filter=.* "--" -cl-std=CL1.2 -c -DOLDCLOLDAOC // RUN: %check_clang_tidy -check-suffix=NEWCLOLDAOC %s altera-single-work-item-barrier %t -- -header-filter=.* "--" -cl-std=CL2.0 -c -DNEWCLOLDAOC -// RUN: %check_clang_tidy -check-suffix=OLDCLNEWAOC %s altera-single-work-item-barrier %t -- -config='{CheckOptions: [{key: altera-single-work-item-barrier.AOCVersion, value: 1701}]}' -header-filter=.* "--" -cl-std=CL1.2 -c -DOLDCLNEWAOC -// RUN: %check_clang_tidy -check-suffix=NEWCLNEWAOC %s altera-single-work-item-barrier %t -- -config='{CheckOptions: [{key: altera-single-work-item-barrier.AOCVersion, value: 1701}]}' -header-filter=.* "--" -cl-std=CL2.0 -c -DNEWCLNEWAOC +// RUN: %check_clang_tidy -check-suffix=OLDCLNEWAOC %s altera-single-work-item-barrier %t -- -config='{CheckOptions: { altera-single-work-item-barrier.AOCVersion: 1701}}' -header-filter=.* "--" -cl-std=CL1.2 -c -DOLDCLNEWAOC +// RUN: %check_clang_tidy -check-suffix=NEWCLNEWAOC %s altera-single-work-item-barrier %t -- -config='{CheckOptions: { altera-single-work-item-barrier.AOCVersion: 1701}}' -header-filter=.* "--" -cl-std=CL2.0 -c -DNEWCLNEWAOC #ifdef OLDCLOLDAOC // OpenCL 1.2 Altera Offline Compiler < 17.1 void __kernel error_barrier_no_id(__global int * foo, int size) { diff --git a/clang-tools-extra/test/clang-tidy/checkers/altera/unroll-loops.cpp b/clang-tools-extra/test/clang-tidy/checkers/altera/unroll-loops.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/altera/unroll-loops.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/altera/unroll-loops.cpp @@ -1,5 +1,5 @@ -// RUN: %check_clang_tidy %s altera-unroll-loops %t -- -config="{CheckOptions: [{key: "altera-unroll-loops.MaxLoopIterations", value: 50}]}" -header-filter=.* -// RUN: %check_clang_tidy -check-suffix=MULT %s altera-unroll-loops %t -- -config="{CheckOptions: [{key: "altera-unroll-loops.MaxLoopIterations", value: 5}]}" -header-filter=.* "--" -DMULT +// RUN: %check_clang_tidy %s altera-unroll-loops %t -- -config="{CheckOptions: {altera-unroll-loops.MaxLoopIterations: 50}}" -header-filter=.* +// RUN: %check_clang_tidy -check-suffix=MULT %s altera-unroll-loops %t -- -config="{CheckOptions: {altera-unroll-loops.MaxLoopIterations: 5}}" -header-filter=.* "--" -DMULT #ifdef MULT // For loops with *= and /= increments. diff --git a/clang-tools-extra/test/clang-tidy/checkers/android/comparison-in-temp-failure-retry-custom-macro.c b/clang-tools-extra/test/clang-tidy/checkers/android/comparison-in-temp-failure-retry-custom-macro.c --- a/clang-tools-extra/test/clang-tidy/checkers/android/comparison-in-temp-failure-retry-custom-macro.c +++ b/clang-tools-extra/test/clang-tidy/checkers/android/comparison-in-temp-failure-retry-custom-macro.c @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s android-comparison-in-temp-failure-retry %t -- -config="{CheckOptions: [{key: android-comparison-in-temp-failure-retry.RetryMacros, value: 'MY_TEMP_FAILURE_RETRY,MY_OTHER_TEMP_FAILURE_RETRY'}]}" +// RUN: %check_clang_tidy %s android-comparison-in-temp-failure-retry %t -- -config="{CheckOptions: {android-comparison-in-temp-failure-retry.RetryMacros: 'MY_TEMP_FAILURE_RETRY,MY_OTHER_TEMP_FAILURE_RETRY'}}" #define MY_TEMP_FAILURE_RETRY(x) \ ({ \ diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-ignore-single-argument.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-ignore-single-argument.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-ignore-single-argument.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-ignore-single-argument.cpp @@ -1,13 +1,13 @@ // RUN: %check_clang_tidy %s bugprone-argument-comment %t -- \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: bugprone-argument-comment.IgnoreSingleArgument, value: true}, \ -// RUN: {key: bugprone-argument-comment.CommentBoolLiterals, value: true}, \ -// RUN: {key: bugprone-argument-comment.CommentIntegerLiterals, value: true}, \ -// RUN: {key: bugprone-argument-comment.CommentFloatLiterals, value: true}, \ -// RUN: {key: bugprone-argument-comment.CommentUserDefinedLiterals, value: true}, \ -// RUN: {key: bugprone-argument-comment.CommentStringLiterals, value: true}, \ -// RUN: {key: bugprone-argument-comment.CommentNullPtrs, value: true}, \ -// RUN: {key: bugprone-argument-comment.CommentCharacterLiterals, value: true}]}" -- +// RUN: -config="{CheckOptions: { \ +// RUN: bugprone-argument-comment.IgnoreSingleArgument: true, \ +// RUN: bugprone-argument-comment.CommentBoolLiterals: true, \ +// RUN: bugprone-argument-comment.CommentIntegerLiterals: true, \ +// RUN: bugprone-argument-comment.CommentFloatLiterals: true, \ +// RUN: bugprone-argument-comment.CommentUserDefinedLiterals: true, \ +// RUN: bugprone-argument-comment.CommentStringLiterals: true, \ +// RUN: bugprone-argument-comment.CommentNullPtrs: true, \ +// RUN: bugprone-argument-comment.CommentCharacterLiterals: true}}" -- struct A { void foo(bool abc); diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-literals.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-literals.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-literals.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-literals.cpp @@ -1,12 +1,12 @@ // RUN: %check_clang_tidy %s bugprone-argument-comment %t -- \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: bugprone-argument-comment.CommentBoolLiterals, value: true}, \ -// RUN: {key: bugprone-argument-comment.CommentIntegerLiterals, value: true}, \ -// RUN: {key: bugprone-argument-comment.CommentFloatLiterals, value: true}, \ -// RUN: {key: bugprone-argument-comment.CommentUserDefinedLiterals, value: true}, \ -// RUN: {key: bugprone-argument-comment.CommentStringLiterals, value: true}, \ -// RUN: {key: bugprone-argument-comment.CommentNullPtrs, value: true}, \ -// RUN: {key: bugprone-argument-comment.CommentCharacterLiterals, value: true}]}" -- +// RUN: -config="{CheckOptions: { \ +// RUN: bugprone-argument-comment.CommentBoolLiterals: true, \ +// RUN: bugprone-argument-comment.CommentIntegerLiterals: true, \ +// RUN: bugprone-argument-comment.CommentFloatLiterals: true, \ +// RUN: bugprone-argument-comment.CommentUserDefinedLiterals: true, \ +// RUN: bugprone-argument-comment.CommentStringLiterals: true, \ +// RUN: bugprone-argument-comment.CommentNullPtrs: true, \ +// RUN: bugprone-argument-comment.CommentCharacterLiterals: true}}" -- struct A { void foo(bool abc); diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-strict.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-strict.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-strict.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s bugprone-argument-comment %t -- \ -// RUN: -config="{CheckOptions: [{key: StrictMode, value: true}]}" -- +// RUN: -config="{CheckOptions: {StrictMode: true}}" -- void f(int _with_underscores_); void g(int x_); diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/assert-side-effect.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/assert-side-effect.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/assert-side-effect.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/assert-side-effect.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s bugprone-assert-side-effect %t -- -config="{CheckOptions: [{key: bugprone-assert-side-effect.CheckFunctionCalls, value: true}, {key: bugprone-assert-side-effect.AssertMacros, value: 'assert,assert2,my_assert,convoluted_assert,msvc_assert'}, {key: bugprone-assert-side-effect.IgnoredFunctions, value: 'MyClass::badButIgnoredFunc'}]}" -- -fexceptions -I %S/Inputs/assert-side-effect +// RUN: %check_clang_tidy %s bugprone-assert-side-effect %t -- -config="{CheckOptions: {bugprone-assert-side-effect.CheckFunctionCalls: true, bugprone-assert-side-effect.AssertMacros: 'assert,assert2,my_assert,convoluted_assert,msvc_assert', bugprone-assert-side-effect.IgnoredFunctions: 'MyClass::badButIgnoredFunc'}}" -- -fexceptions -I %S/Inputs/assert-side-effect #include bool badButIgnoredFunc(int a, int b) { return a * b > 0; } diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/dangling-handle.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/dangling-handle.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/dangling-handle.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/dangling-handle.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy -std=c++11,c++14 %s bugprone-dangling-handle %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: bugprone-dangling-handle.HandleClasses, \ -// RUN: value: 'std::basic_string_view; ::llvm::StringRef;'}]}" +// RUN: {bugprone-dangling-handle.HandleClasses: \ +// RUN: 'std::basic_string_view; ::llvm::StringRef;'}}" // FIXME: Fix the checker to work in C++17 or later mode. namespace std { diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-ignore.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-ignore.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-ignore.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-ignore.cpp @@ -1,13 +1,13 @@ // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: "\"\";Foo;Bar"}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: "T"}, \ -// RUN: {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \ -// RUN: ]}' -- +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-easily-swappable-parameters.MinimumLength: 2, \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterNames: "\"\";Foo;Bar", \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "T", \ +// RUN: bugprone-easily-swappable-parameters.QualifiersMix: 0, \ +// RUN: bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \ +// RUN: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \ +// RUN: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \ +// RUN: }}' -- void ignoredUnnamed(int I, int, int) {} // NO-WARN: No >= 2 length of non-unnamed. diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicit-qualifiers.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicit-qualifiers.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicit-qualifiers.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicit-qualifiers.cpp @@ -1,13 +1,13 @@ // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 1}, \ -// RUN: {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 1}, \ -// RUN: {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \ -// RUN: ]}' -- +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-easily-swappable-parameters.MinimumLength: 2, \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \ +// RUN: bugprone-easily-swappable-parameters.QualifiersMix: 1, \ +// RUN: bugprone-easily-swappable-parameters.ModelImplicitConversions: 1, \ +// RUN: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \ +// RUN: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \ +// RUN: }}' -- void numericAndQualifierConversion(int I, const double CD) { numericAndQualifierConversion(CD, I); } // CHECK-MESSAGES: :[[@LINE-1]]:36: warning: 2 adjacent parameters of 'numericAndQualifierConversion' of convertible types are easily swapped by mistake [bugprone-easily-swappable-parameters] diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.c --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.c +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.c @@ -1,13 +1,13 @@ // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 1}, \ -// RUN: {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \ -// RUN: ]}' -- +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-easily-swappable-parameters.MinimumLength: 2, \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \ +// RUN: bugprone-easily-swappable-parameters.QualifiersMix: 0, \ +// RUN: bugprone-easily-swappable-parameters.ModelImplicitConversions: 1, \ +// RUN: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \ +// RUN: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \ +// RUN: }}' -- void implicitDoesntBreakOtherStuff(int A, int B) {} // CHECK-MESSAGES: :[[@LINE-1]]:36: warning: 2 adjacent parameters of 'implicitDoesntBreakOtherStuff' of similar type ('int') are easily swapped by mistake [bugprone-easily-swappable-parameters] diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.cpp @@ -1,13 +1,13 @@ // RUN: %check_clang_tidy -std=c++17-or-later %s bugprone-easily-swappable-parameters %t \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 1}, \ -// RUN: {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \ -// RUN: ]}' -- +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-easily-swappable-parameters.MinimumLength: 2, \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \ +// RUN: bugprone-easily-swappable-parameters.QualifiersMix: 0, \ +// RUN: bugprone-easily-swappable-parameters.ModelImplicitConversions: 1, \ +// RUN: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \ +// RUN: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \ +// RUN: }}' -- void implicitDoesntBreakOtherStuff(int A, int B) {} // CHECK-MESSAGES: :[[@LINE-1]]:36: warning: 2 adjacent parameters of 'implicitDoesntBreakOtherStuff' of similar type ('int') are easily swapped by mistake [bugprone-easily-swappable-parameters] diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len2.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len2.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len2.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len2.cpp @@ -1,13 +1,13 @@ // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \ -// RUN: ]}' -- +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-easily-swappable-parameters.MinimumLength: 2, \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \ +// RUN: bugprone-easily-swappable-parameters.QualifiersMix: 0, \ +// RUN: bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \ +// RUN: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \ +// RUN: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \ +// RUN: }}' -- namespace std { using size_t = decltype(sizeof(int)); diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len3.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len3.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len3.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len3.cpp @@ -1,13 +1,13 @@ // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-easily-swappable-parameters.MinimumLength, value: 3}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \ -// RUN: ]}' -- +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-easily-swappable-parameters.MinimumLength: 3, \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \ +// RUN: bugprone-easily-swappable-parameters.QualifiersMix: 0, \ +// RUN: bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \ +// RUN: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \ +// RUN: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \ +// RUN: }}' -- int add(int Left, int Right) { return Left + Right; } // NO-WARN: Only 2 parameters. diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-prefixsuffixname.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-prefixsuffixname.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-prefixsuffixname.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-prefixsuffixname.cpp @@ -1,13 +1,13 @@ // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 1} \ -// RUN: ]}' -- +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-easily-swappable-parameters.MinimumLength: 2, \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \ +// RUN: bugprone-easily-swappable-parameters.QualifiersMix: 0, \ +// RUN: bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \ +// RUN: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \ +// RUN: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 1 \ +// RUN: }}' -- namespace std { struct string {}; diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-qualifiermixing.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-qualifiermixing.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-qualifiermixing.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-qualifiermixing.cpp @@ -1,13 +1,13 @@ // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 1}, \ -// RUN: {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \ -// RUN: ]}' -- +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-easily-swappable-parameters.MinimumLength: 2, \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \ +// RUN: bugprone-easily-swappable-parameters.QualifiersMix: 1, \ +// RUN: bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \ +// RUN: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \ +// RUN: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \ +// RUN: }}' -- typedef int MyInt1; typedef int MyInt2; diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.c --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.c +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.c @@ -1,13 +1,13 @@ // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 1}, \ -// RUN: {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \ -// RUN: ]}' -- -Wno-strict-prototypes -x c +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-easily-swappable-parameters.MinimumLength: 2, \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \ +// RUN: bugprone-easily-swappable-parameters.QualifiersMix: 0, \ +// RUN: bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \ +// RUN: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 1, \ +// RUN: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \ +// RUN: }}' -- -Wno-strict-prototypes -x c int myprint(); int add(int X, int Y); diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.cpp @@ -1,13 +1,13 @@ // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 1}, \ -// RUN: {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \ -// RUN: ]}' -- +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-easily-swappable-parameters.MinimumLength: 2, \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \ +// RUN: bugprone-easily-swappable-parameters.QualifiersMix: 0, \ +// RUN: bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \ +// RUN: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 1, \ +// RUN: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \ +// RUN: }}' -- namespace std { template diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters.c --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters.c +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters.c @@ -1,13 +1,13 @@ // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \ -// RUN: {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: "bool;MyBool;struct U;MAKE_LOGICAL_TYPE(int)"}, \ -// RUN: {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \ -// RUN: {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \ -// RUN: ]}' -- -Wno-strict-prototypes -x c +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-easily-swappable-parameters.MinimumLength: 2, \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \ +// RUN: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "bool;MyBool;struct U;MAKE_LOGICAL_TYPE(int)", \ +// RUN: bugprone-easily-swappable-parameters.QualifiersMix: 0, \ +// RUN: bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \ +// RUN: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \ +// RUN: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \ +// RUN: }}' -- -Wno-strict-prototypes -x c #define bool _Bool #define true 1 diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/exception-escape.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/exception-escape.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/exception-escape.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/exception-escape.cpp @@ -1,8 +1,8 @@ // RUN: %check_clang_tidy -std=c++11,c++14 %s bugprone-exception-escape %t -- \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: bugprone-exception-escape.IgnoredExceptions, value: 'ignored1,ignored2'}, \ -// RUN: {key: bugprone-exception-escape.FunctionsThatShouldNotThrow, value: 'enabled1,enabled2,enabled3'} \ -// RUN: ]}" \ +// RUN: -config="{CheckOptions: { \ +// RUN: bugprone-exception-escape.IgnoredExceptions: 'ignored1,ignored2', \ +// RUN: bugprone-exception-escape.FunctionsThatShouldNotThrow: 'enabled1,enabled2,enabled3' \ +// RUN: }}" \ // RUN: -- -fexceptions // FIXME: Fix the checker to work in C++17 or later mode. diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-array-subscript-expression.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-array-subscript-expression.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-array-subscript-expression.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-array-subscript-expression.cpp @@ -2,13 +2,13 @@ // RUN: %check_clang_tidy -check-suffixes=ALL,CXX %s bugprone-implicit-widening-of-multiplication-result %t -- -- -target x86_64-unknown-unknown -x c++ // RUN: %check_clang_tidy -check-suffixes=ALL,C -std=c99 %s bugprone-implicit-widening-of-multiplication-result %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources, value: false} \ -// RUN: ]}' -- -target x86_64-unknown-unknown -x c +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources: false \ +// RUN: }}' -- -target x86_64-unknown-unknown -x c // RUN: %check_clang_tidy -check-suffixes=ALL,C %s bugprone-implicit-widening-of-multiplication-result %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources, value: false} \ -// RUN: ]}' -- -target x86_64-unknown-unknown -x c++ +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources: false \ +// RUN: }}' -- -target x86_64-unknown-unknown -x c++ char *t0(char *base, int a, int b) { return &base[a * b]; diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-int.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-int.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-int.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-int.cpp @@ -2,13 +2,13 @@ // RUN: %check_clang_tidy -check-suffixes=ALL,CXX %s bugprone-implicit-widening-of-multiplication-result %t -- -- -target x86_64-unknown-unknown -x c++ // RUN: %check_clang_tidy -check-suffixes=ALL,C -std=c99 %s bugprone-implicit-widening-of-multiplication-result %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources, value: false} \ -// RUN: ]}' -- -target x86_64-unknown-unknown -x c +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources: false \ +// RUN: }}' -- -target x86_64-unknown-unknown -x c // RUN: %check_clang_tidy -check-suffixes=ALL,C %s bugprone-implicit-widening-of-multiplication-result %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources, value: false} \ -// RUN: ]}' -- -target x86_64-unknown-unknown -x c++ +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources: false \ +// RUN: }}' -- -target x86_64-unknown-unknown -x c++ long t0(int a, int b) { return a * b; diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-pointer-offset.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-pointer-offset.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-pointer-offset.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-pointer-offset.cpp @@ -2,13 +2,13 @@ // RUN: %check_clang_tidy -check-suffixes=ALL,CXX %s bugprone-implicit-widening-of-multiplication-result %t -- -- -target x86_64-unknown-unknown -x c++ // RUN: %check_clang_tidy -check-suffixes=ALL,C -std=c99 %s bugprone-implicit-widening-of-multiplication-result %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources, value: false} \ -// RUN: ]}' -- -target x86_64-unknown-unknown -x c +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources: false \ +// RUN: }}' -- -target x86_64-unknown-unknown -x c // RUN: %check_clang_tidy -check-suffixes=ALL,C %s bugprone-implicit-widening-of-multiplication-result %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources, value: false} \ -// RUN: ]}' -- -target x86_64-unknown-unknown -x c++ +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources: false \ +// RUN: }}' -- -target x86_64-unknown-unknown -x c++ char *t0(char *base, int a, int b) { return base + a * b; diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-explicit-only.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-explicit-only.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-explicit-only.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-explicit-only.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s bugprone-misplaced-widening-cast %t -- -config="{CheckOptions: [{key: bugprone-misplaced-widening-cast.CheckImplicitCasts, value: false}]}" -- +// RUN: %check_clang_tidy %s bugprone-misplaced-widening-cast %t -- -config="{CheckOptions: {bugprone-misplaced-widening-cast.CheckImplicitCasts: false}}" -- void func(long arg) {} diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-implicit-enabled.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-implicit-enabled.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-implicit-enabled.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-implicit-enabled.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s bugprone-misplaced-widening-cast %t -- -config="{CheckOptions: [{key: bugprone-misplaced-widening-cast.CheckImplicitCasts, value: true}]}" -- +// RUN: %check_clang_tidy %s bugprone-misplaced-widening-cast %t -- -config="{CheckOptions: {bugprone-misplaced-widening-cast.CheckImplicitCasts: true}}" -- void func(long arg) {} diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-before-safe.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-before-safe.c --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-before-safe.c +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-before-safe.c @@ -1,7 +1,6 @@ // RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: bugprone-not-null-terminated-result.WantToUseSafeFunctions, \ -// RUN: value: true}]}" \ +// RUN: {bugprone-not-null-terminated-result.WantToUseSafeFunction: true}}" \ // RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result #include "not-null-terminated-result-c.h" diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-invert.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-invert.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-invert.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-invert.cpp @@ -1,8 +1,8 @@ // RUN: %check_clang_tidy %s bugprone-reserved-identifier %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: bugprone-reserved-identifier.Invert, value: true}, \ -// RUN: {key: bugprone-reserved-identifier.AllowedIdentifiers, value: "std;reference_wrapper;^c?ref;type;get"}, \ -// RUN: ]}' -- \ +// RUN: -config='{CheckOptions: { \ +// RUN: bugprone-reserved-identifier.Invert: true, \ +// RUN: bugprone-reserved-identifier.AllowedIdentifiers: "std;reference_wrapper;ref;^c?ref;type;get" \ +// RUN: }}' -- \ // RUN: -I%S/Inputs/reserved-identifier \ // RUN: -isystem %S/Inputs/reserved-identifier/system diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s bugprone-signal-handler %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: bugprone-signal-handler.AsyncSafeFunctionSet, value: "minimal"}]}' \ +// RUN: {bugprone-signal-handler.AsyncSafeFunctionSet: "minimal"}}' \ // RUN: -- -isystem %clang_tidy_headers #include "signal.h" diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s bugprone-signal-handler %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: bugprone-signal-handler.AsyncSafeFunctionSet, value: "POSIX"}]}' \ +// RUN: {bugprone-signal-handler.AsyncSafeFunctionSet: "POSIX"}}' \ // RUN: -- -isystem %clang_tidy_headers #include "signal.h" diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-with-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-with-option.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-with-option.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-with-option.cpp @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s bugprone-signed-char-misuse %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: bugprone-signed-char-misuse.CharTypdefsToIgnore, value: "sal_Int8;int8_t"}]}' \ +// RUN: {bugprone-signed-char-misuse.CharTypdefsToIgnore: "sal_Int8;int8_t"}}' \ // RUN: -- /////////////////////////////////////////////////////////////////// diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-expression.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-expression.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-expression.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-expression.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s bugprone-sizeof-expression %t -- -config="{CheckOptions: [{key: bugprone-sizeof-expression.WarnOnSizeOfIntegerExpression, value: true}]}" -- +// RUN: %check_clang_tidy %s bugprone-sizeof-expression %t -- -config="{CheckOptions: {bugprone-sizeof-expression.WarnOnSizeOfIntegerExpression: true}}" -- class C { int size() { return sizeof(this); } diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage-strict.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage-strict.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage-strict.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s bugprone-suspicious-enum-usage %t -- -config="{CheckOptions: [{key: bugprone-suspicious-enum-usage.StrictMode, value: true}]}" -- +// RUN: %check_clang_tidy %s bugprone-suspicious-enum-usage %t -- -config="{CheckOptions: {bugprone-suspicious-enum-usage.StrictMode: true}}" -- enum A { A = 1, diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s bugprone-suspicious-enum-usage %t -- -config="{CheckOptions: [{key: bugprone-suspicious-enum-usage.StrictMode, value: false}]}" -- +// RUN: %check_clang_tidy %s bugprone-suspicious-enum-usage %t -- -config="{CheckOptions: {bugprone-suspicious-enum-usage.StrictMode: false}}" -- enum Empty { }; diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.c --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.c +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.c @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s bugprone-suspicious-string-compare %t -- \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: bugprone-suspicious-string-compare.WarnOnImplicitComparison, value: true}, \ -// RUN: {key: bugprone-suspicious-string-compare.WarnOnLogicalNotComparison, value: true}]}' \ +// RUN: {bugprone-suspicious-string-compare.WarnOnImplicitComparison: true, \ +// RUN: bugprone-suspicious-string-compare.WarnOnLogicalNotComparison: true}}' \ // RUN: -- -std=c99 static const char A[] = "abc"; diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s bugprone-suspicious-string-compare %t -- \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: bugprone-suspicious-string-compare.WarnOnImplicitComparison, value: true}, \ -// RUN: {key: bugprone-suspicious-string-compare.WarnOnLogicalNotComparison, value: true}]}' \ +// RUN: {bugprone-suspicious-string-compare.WarnOnImplicitComparison: true, \ +// RUN: bugprone-suspicious-string-compare.WarnOnLogicalNotComparison: true}}' \ // RUN: -- typedef __SIZE_TYPE__ size; diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/too-small-loop-variable.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/too-small-loop-variable.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/too-small-loop-variable.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/too-small-loop-variable.cpp @@ -1,7 +1,6 @@ // RUN: %check_clang_tidy %s bugprone-too-small-loop-variable %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: bugprone-too-small-loop-variable.MagnitudeBitsUpperLimit, \ -// RUN: value: 1024}]}" \ +// RUN: {bugprone-too-small-loop-variable.MagnitudeBitsUpperLimit: 1024}}" \ // RUN: -- --target=x86_64-linux long size() { return 294967296l; } diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp @@ -1,7 +1,6 @@ // RUN: %check_clang_tidy %s bugprone-unhandled-self-assignment %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: bugprone-unhandled-self-assignment.WarnOnlyIfThisHasSuspiciousField, \ -// RUN: value: false}]}" +// RUN: {bugprone-unhandled-self-assignment.WarnOnlyIfThisHasSuspiciousField: false}}" // Classes with pointer field are still caught. class PtrField { diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value-custom.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value-custom.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value-custom.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value-custom.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s bugprone-unused-return-value %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: bugprone-unused-return-value.CheckedFunctions, \ -// RUN: value: "::fun;::ns::Outer::Inner::memFun;::ns::Type::staticFun;::ns::ClassTemplate::memFun;::ns::ClassTemplate::staticFun"}]}' \ +// RUN: {bugprone-unused-return-value.CheckedFunctions: \ +// RUN: "::fun;::ns::Outer::Inner::memFun;::ns::Type::staticFun;::ns::ClassTemplate::memFun;::ns::ClassTemplate::staticFun"}}' \ // RUN: -- namespace std { diff --git a/clang-tools-extra/test/clang-tidy/checkers/cert/msc32-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert/msc32-c.c --- a/clang-tools-extra/test/clang-tidy/checkers/cert/msc32-c.c +++ b/clang-tools-extra/test/clang-tidy/checkers/cert/msc32-c.c @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s cert-msc32-c %t -- -config="{CheckOptions: [{key: cert-msc32-c.DisallowedSeedTypes, value: 'some_type,time_t'}]}" -- -std=c99 +// RUN: %check_clang_tidy %s cert-msc32-c %t -- -config="{CheckOptions: {cert-msc32-c.DisallowedSeedTypes: 'some_type,time_t'}}" -- -std=c99 void srand(int seed); typedef int time_t; diff --git a/clang-tools-extra/test/clang-tidy/checkers/cert/msc51-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/msc51-cpp.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cert/msc51-cpp.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cert/msc51-cpp.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s cert-msc51-cpp %t -- \ -// RUN: -config="{CheckOptions: [{key: cert-msc51-cpp.DisallowedSeedTypes, value: 'some_type,time_t'}]}" +// RUN: -config="{CheckOptions: {cert-msc51-cpp.DisallowedSeedTypes: 'some_type,time_t'}}" namespace std { diff --git a/clang-tools-extra/test/clang-tidy/checkers/cert/oop57-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/oop57-cpp.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cert/oop57-cpp.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cert/oop57-cpp.cpp @@ -1,8 +1,8 @@ // RUN: %check_clang_tidy %s cert-oop57-cpp %t -- \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: cert-oop57-cpp.MemSetNames, value: mymemset}, \ -// RUN: {key: cert-oop57-cpp.MemCpyNames, value: mymemcpy}, \ -// RUN: {key: cert-oop57-cpp.MemCmpNames, value: mymemcmp}]}' \ +// RUN: {cert-oop57-cpp.MemSetNames: mymemset, \ +// RUN: cert-oop57-cpp.MemCpyNames: mymemcpy, \ +// RUN: cert-oop57-cpp.MemCmpNames: mymemcmp}}' \ // RUN: -- void mymemset(void *, unsigned char, decltype(sizeof(int))); diff --git a/clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-glibc.cpp b/clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-glibc.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-glibc.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-glibc.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s concurrency-mt-unsafe %t -- -config='{CheckOptions: [{key: "concurrency-mt-unsafe.FunctionSet", value: "glibc"}]}' +// RUN: %check_clang_tidy %s concurrency-mt-unsafe %t -- -config='{CheckOptions: {concurrency-mt-unsafe.FunctionSet: "glibc"}}' extern unsigned int sleep (unsigned int __seconds); extern int *gmtime (const int *__timer); diff --git a/clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-posix.cpp b/clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-posix.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-posix.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-posix.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s concurrency-mt-unsafe %t -- -config='{CheckOptions: [{key: "concurrency-mt-unsafe.FunctionSet", value: "posix"}]}' +// RUN: %check_clang_tidy %s concurrency-mt-unsafe %t -- -config='{CheckOptions: {concurrency-mt-unsafe.FunctionSet: "posix"}}' extern unsigned int sleep (unsigned int __seconds); extern int *gmtime (const int *__timer); diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-caps-only.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-caps-only.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-caps-only.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-caps-only.cpp @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s cppcoreguidelines-macro-usage %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: cppcoreguidelines-macro-usage.CheckCapsOnly, value: true}]}' -- +// RUN: {cppcoreguidelines-macro-usage.CheckCapsOnly: true}}' -- #ifndef INCLUDE_GUARD #define INCLUDE_GUARD diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-command-line-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-command-line-macros.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-command-line-macros.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-command-line-macros.cpp @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy -check-suffixes=NORMAL %s cppcoreguidelines-macro-usage %t -- -- -D_ZZZ_IM_A_MACRO -// RUN: %check_clang_tidy -check-suffixes=NORMAL %s cppcoreguidelines-macro-usage %t -- -config='{CheckOptions: [{key: cppcoreguidelines-macro-usage.IgnoreCommandLineMacros, value: true}]}' -- -D_ZZZ_IM_A_MACRO -// RUN: %check_clang_tidy -check-suffixes=NORMAL,CL %s cppcoreguidelines-macro-usage %t -- -config='{CheckOptions: [{key: cppcoreguidelines-macro-usage.IgnoreCommandLineMacros, value: false}]}' -- -D_ZZZ_IM_A_MACRO +// RUN: %check_clang_tidy -check-suffixes=NORMAL %s cppcoreguidelines-macro-usage %t -- -config='{CheckOptions: {cppcoreguidelines-macro-usage.IgnoreCommandLineMacros: true}}' -- -D_ZZZ_IM_A_MACRO +// RUN: %check_clang_tidy -check-suffixes=NORMAL,CL %s cppcoreguidelines-macro-usage %t -- -config='{CheckOptions: {cppcoreguidelines-macro-usage.IgnoreCommandLineMacros: false}}' -- -D_ZZZ_IM_A_MACRO // CHECK-MESSAGES-CL: warning: macro '_ZZZ_IM_A_MACRO' used to declare a constant; consider using a 'constexpr' constant diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-custom.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-custom.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-custom.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-custom.cpp @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s cppcoreguidelines-macro-usage %t \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: cppcoreguidelines-macro-usage.AllowedRegexp, value: 'DEBUG_*|TEST_*'}]}" -- +// RUN: {cppcoreguidelines-macro-usage.AllowedRegexp: 'DEBUG_*|TEST_*'}}" -- #ifndef INCLUDE_GUARD #define INCLUDE_GUARD diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-equivalentbitwidth-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-equivalentbitwidth-option.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-equivalentbitwidth-option.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-equivalentbitwidth-option.cpp @@ -1,13 +1,10 @@ // RUN: %check_clang_tidy -check-suffix=DEFAULT %s \ -// RUN: cppcoreguidelines-narrowing-conversions %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: ]}' +// RUN: cppcoreguidelines-narrowing-conversions %t -- // RUN: %check_clang_tidy -check-suffix=DISABLED %s \ // RUN: cppcoreguidelines-narrowing-conversions %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: cppcoreguidelines-narrowing-conversions.WarnOnEquivalentBitWidth, value: 0} \ -// RUN: ]}' +// RUN: -config='{CheckOptions: { \ +// RUN: cppcoreguidelines-narrowing-conversions.WarnOnEquivalentBitWidth: 0}}' void narrowing_equivalent_bitwidth() { int i; diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-ignoreconversionfromtypes-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-ignoreconversionfromtypes-option.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-ignoreconversionfromtypes-option.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-ignoreconversionfromtypes-option.cpp @@ -1,13 +1,11 @@ // RUN: %check_clang_tidy -check-suffix=DEFAULT %s \ -// RUN: cppcoreguidelines-narrowing-conversions %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: ]}' +// RUN: cppcoreguidelines-narrowing-conversions %t -- // RUN: %check_clang_tidy -check-suffix=IGNORED %s \ // RUN: cppcoreguidelines-narrowing-conversions %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: cppcoreguidelines-narrowing-conversions.IgnoreConversionFromTypes, value: "global_size_t;nested_size_type"} \ -// RUN: ]}' +// RUN: -config='{CheckOptions: { \ +// RUN: cppcoreguidelines-narrowing-conversions.IgnoreConversionFromTypes: "global_size_t;nested_size_type" \ +// RUN: }}' // We use global_size_t instead of 'size_t' because windows predefines size_t. typedef long long global_size_t; diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-intemplates-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-intemplates-option.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-intemplates-option.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-intemplates-option.cpp @@ -1,13 +1,11 @@ // RUN: %check_clang_tidy -check-suffix=DEFAULT %s \ -// RUN: cppcoreguidelines-narrowing-conversions %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: ]}' +// RUN: cppcoreguidelines-narrowing-conversions %t -- // RUN: %check_clang_tidy -check-suffix=WARN %s \ // RUN: cppcoreguidelines-narrowing-conversions %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: cppcoreguidelines-narrowing-conversions.WarnWithinTemplateInstantiation, value: 1} \ -// RUN: ]}' +// RUN: -config='{CheckOptions: { \ +// RUN: cppcoreguidelines-narrowing-conversions.WarnWithinTemplateInstantiation: 1 \ +// RUN: }}' template void assign_in_template(OrigType jj) { diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowinginteger-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowinginteger-option.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowinginteger-option.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowinginteger-option.cpp @@ -1,10 +1,10 @@ // RUN: %check_clang_tidy -check-suffix=DEFAULT %s \ // RUN: cppcoreguidelines-narrowing-conversions %t -- \ -// RUN: -config='{CheckOptions: [{key: cppcoreguidelines-narrowing-conversions.WarnOnIntegerNarrowingConversion, value: true}]}' +// RUN: -config='{CheckOptions: {cppcoreguidelines-narrowing-conversions.WarnOnIntegerNarrowingConversion: true}}' // RUN: %check_clang_tidy -check-suffix=DISABLED %s \ // RUN: cppcoreguidelines-narrowing-conversions %t -- \ -// RUN: -config='{CheckOptions: [{key: cppcoreguidelines-narrowing-conversions.WarnOnIntegerNarrowingConversion, value: false}]}' +// RUN: -config='{CheckOptions: {cppcoreguidelines-narrowing-conversions.WarnOnIntegerNarrowingConversion: false}}' void foo(unsigned long long value) { int a = value; diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowingintegertofloatingpoint-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowingintegertofloatingpoint-option.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowingintegertofloatingpoint-option.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowingintegertofloatingpoint-option.cpp @@ -1,10 +1,10 @@ // RUN: %check_clang_tidy -check-suffix=DEFAULT %s \ // RUN: cppcoreguidelines-narrowing-conversions %t -- \ -// RUN: -config='{CheckOptions: [{key: cppcoreguidelines-narrowing-conversions.WarnOnIntegerToFloatingPointNarrowingConversion, value: true}]}' +// RUN: -config='{CheckOptions: {cppcoreguidelines-narrowing-conversions.WarnOnIntegerToFloatingPointNarrowingConversion: true}}' // RUN: %check_clang_tidy -check-suffix=DISABLED %s \ // RUN: cppcoreguidelines-narrowing-conversions %t -- \ -// RUN: -config='{CheckOptions: [{key: cppcoreguidelines-narrowing-conversions.WarnOnIntegerToFloatingPointNarrowingConversion, value: false}]}' +// RUN: -config='{CheckOptions: {cppcoreguidelines-narrowing-conversions.WarnOnIntegerToFloatingPointNarrowingConversion: false}}' void foo(unsigned long long value) { double a = value; diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-pedanticmode-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-pedanticmode-option.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-pedanticmode-option.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-pedanticmode-option.cpp @@ -1,7 +1,6 @@ // RUN: %check_clang_tidy %s cppcoreguidelines-narrowing-conversions %t \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: "cppcoreguidelines-narrowing-conversions.PedanticMode", value: true} \ -// RUN: ]}" \ +// RUN: -config="{CheckOptions: { \ +// RUN: cppcoreguidelines-narrowing-conversions.PedanticMode: true}}" \ // RUN: -- -target x86_64-unknown-linux -fsigned-char namespace floats { diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions.cpp @@ -1,7 +1,6 @@ // RUN: %check_clang_tidy %s cppcoreguidelines-narrowing-conversions %t \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: "cppcoreguidelines-narrowing-conversions.WarnOnFloatingPointNarrowingConversion", value: false}, \ -// RUN: ]}" \ +// RUN: -config="{CheckOptions: { \ +// RUN: cppcoreguidelines-narrowing-conversions.WarnOnFloatingPointNarrowingConversion: false}}" \ // RUN: -- -target x86_64-unknown-linux -fsigned-char float ceil(float); diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-custom.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-custom.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-custom.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-custom.cpp @@ -1,8 +1,8 @@ // RUN: %check_clang_tidy %s cppcoreguidelines-no-malloc %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: cppcoreguidelines-no-malloc.Allocations, value: "::malloc;::align_malloc;::calloc"},\ -// RUN: {key: cppcoreguidelines-no-malloc.Reallocations, value: "::realloc;::align_realloc"},\ -// RUN: {key: cppcoreguidelines-no-malloc.Deallocations, value: "::free;::align_free"}]}' \ +// RUN: {cppcoreguidelines-no-malloc.Allocations: "::malloc;::align_malloc;::calloc",\ +// RUN: cppcoreguidelines-no-malloc.Reallocations: "::realloc;::align_realloc",\ +// RUN: cppcoreguidelines-no-malloc.Deallocations: "::free;::align_free"}}' \ // RUN: -- using size_t = __SIZE_TYPE__; diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-no-functions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-no-functions.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-no-functions.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-no-functions.cpp @@ -1,8 +1,8 @@ // RUN: %check_clang_tidy %s cppcoreguidelines-no-malloc %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: cppcoreguidelines-no-malloc.Allocations, value: "::malloc"},\ -// RUN: {key: cppcoreguidelines-no-malloc.Reallocations, value: ""},\ -// RUN: {key: cppcoreguidelines-no-malloc.Deallocations, value: ""}]}' \ +// RUN: {cppcoreguidelines-no-malloc.Allocations: "::malloc",\ +// RUN: cppcoreguidelines-no-malloc.Reallocations: "",\ +// RUN: cppcoreguidelines-no-malloc.Deallocations: ""}}' \ // RUN: -- // Just ensure, the check will not crash, when no functions shall be checked. diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory-legacy-functions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory-legacy-functions.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory-legacy-functions.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory-legacy-functions.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s cppcoreguidelines-owning-memory %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: cppcoreguidelines-owning-memory.LegacyResourceProducers, value: "::malloc;::aligned_alloc;::realloc;::calloc;::fopen;::freopen;::tmpfile"}, \ -// RUN: {key: cppcoreguidelines-owning-memory.LegacyResourceConsumers, value: "::free;::realloc;::freopen;::fclose"}]}' \ +// RUN: {cppcoreguidelines-owning-memory.LegacyResourceProducers: "::malloc;::aligned_alloc;::realloc;::calloc;::fopen;::freopen;::tmpfile", \ +// RUN: cppcoreguidelines-owning-memory.LegacyResourceConsumers: "::free;::realloc;::freopen;::fclose"}}' \ // RUN: -- -nostdlib -nostdinc++ namespace gsl { diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init-assignment.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init-assignment.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init-assignment.cpp @@ -1,8 +1,7 @@ // RUN: %check_clang_tidy %s cppcoreguidelines-prefer-member-initializer,modernize-use-default-member-init %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-default-member-init.UseAssignment, value: true}]}" +// RUN: -config="{CheckOptions: {modernize-use-default-member-init.UseAssignment: true}}" // RUN: %check_clang_tidy %s cppcoreguidelines-prefer-member-initializer,modernize-use-default-member-init %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-default-member-init.UseAssignment, value: false}, \ -// RUN: {key: cppcoreguidelines-prefer-member-initializer.UseAssignment, value: true}]}" +// RUN: -config="{CheckOptions: {modernize-use-default-member-init.UseAssignment: false, cppcoreguidelines-prefer-member-initializer.UseAssignment: true}}" class Simple1 { int n; diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index-gslheader.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index-gslheader.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index-gslheader.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index-gslheader.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s cppcoreguidelines-pro-bounds-constant-array-index %t -- \ -// RUN: -config='{CheckOptions: [{key: cppcoreguidelines-pro-bounds-constant-array-index.GslHeader, value: "dir1/gslheader.h"}]}' +// RUN: -config='{CheckOptions: {cppcoreguidelines-pro-bounds-constant-array-index.GslHeader: "dir1/gslheader.h"}}' // CHECK-FIXES: #include "dir1/gslheader.h" typedef __SIZE_TYPE__ size_t; diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-use-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-use-assignment.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-use-assignment.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-use-assignment.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s cppcoreguidelines-pro-type-member-init %t -- -config="{CheckOptions: [{key: "cppcoreguidelines-pro-type-member-init.UseAssignment", value: true}]}" -- -fsigned-char +// RUN: %check_clang_tidy %s cppcoreguidelines-pro-type-member-init %t -- -config="{CheckOptions: {cppcoreguidelines-pro-type-member-init.UseAssignment: true}}" -- -fsigned-char struct T { int i; diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init.ignorearrays.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init.ignorearrays.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init.ignorearrays.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init.ignorearrays.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s \ // RUN: cppcoreguidelines-pro-type-member-init %t \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: cppcoreguidelines-pro-type-member-init.IgnoreArrays, value: true} ]}" +// RUN: {cppcoreguidelines-pro-type-member-init.IgnoreArrays: true}}" typedef int TypedefArray[4]; using UsingArray = int[4]; diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-allow-missing-move-when-copy-is-deleted.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-allow-missing-move-when-copy-is-deleted.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-allow-missing-move-when-copy-is-deleted.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-allow-missing-move-when-copy-is-deleted.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s cppcoreguidelines-special-member-functions %t -- -config="{CheckOptions: [{key: cppcoreguidelines-special-member-functions.AllowMissingMoveFunctionsWhenCopyIsDeleted, value: true}]}" -- +// RUN: %check_clang_tidy %s cppcoreguidelines-special-member-functions %t -- -config="{CheckOptions: {cppcoreguidelines-special-member-functions.AllowMissingMoveFunctionsWhenCopyIsDeleted: true}}" -- class DefinesEverything { DefinesEverything(const DefinesEverything &); diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-relaxed.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-relaxed.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-relaxed.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-relaxed.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s cppcoreguidelines-special-member-functions %t -- -config="{CheckOptions: [{key: cppcoreguidelines-special-member-functions.AllowMissingMoveFunctions, value: true}, {key: cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor, value: true}]}" -- +// RUN: %check_clang_tidy %s cppcoreguidelines-special-member-functions %t -- -config="{CheckOptions: {cppcoreguidelines-special-member-functions.AllowMissingMoveFunctions: true, cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor: true}}" -- // Don't warn on destructors without definitions, they might be defaulted in another TU. class DeclaresDestructor { diff --git a/clang-tools-extra/test/clang-tidy/checkers/google/runtime-int-std.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/runtime-int-std.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/google/runtime-int-std.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/google/runtime-int-std.cpp @@ -1,9 +1,9 @@ // RUN: %check_clang_tidy %s google-runtime-int %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: google-runtime-int.UnsignedTypePrefix, value: "std::uint"}, \ -// RUN: {key: google-runtime-int.SignedTypePrefix, value: "std::int"}, \ -// RUN: {key: google-runtime-int.TypeSuffix, value: "_t"}, \ -// RUN: ]}' +// RUN: -config='{CheckOptions: { \ +// RUN: google-runtime-int.UnsignedTypePrefix: "std::uint", \ +// RUN: google-runtime-int.SignedTypePrefix: "std::int", \ +// RUN: google-runtime-int.TypeSuffix: "_t", \ +// RUN: }}' long a(); // CHECK-MESSAGES: [[@LINE-1]]:1: warning: consider replacing 'long' with 'std::int{{..}}_t' diff --git a/clang-tools-extra/test/clang-tidy/checkers/hicpp/multiway-paths-covered-else.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp/multiway-paths-covered-else.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/hicpp/multiway-paths-covered-else.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/hicpp/multiway-paths-covered-else.cpp @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s hicpp-multiway-paths-covered %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: hicpp-multiway-paths-covered.WarnOnMissingElse, value: true}]}'\ +// RUN: {hicpp-multiway-paths-covered.WarnOnMissingElse: true}}'\ // RUN: -- enum OS { Mac, diff --git a/clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-integer-literals.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-integer-literals.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-integer-literals.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-integer-literals.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s hicpp-signed-bitwise %t -- \ -// RUN: -config="{CheckOptions: [{key: hicpp-signed-bitwise.IgnorePositiveIntegerLiterals, value: true }]}" \ +// RUN: -config="{CheckOptions: {hicpp-signed-bitwise.IgnorePositiveIntegerLiterals: true}}" \ // RUN: -- -std=c++11 void examples() { diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/non-private-member-variables-in-classes.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/non-private-member-variables-in-classes.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/misc/non-private-member-variables-in-classes.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/misc/non-private-member-variables-in-classes.cpp @@ -1,9 +1,9 @@ // RUN: %check_clang_tidy -check-suffixes=PUBLIC,NONPRIVATE,PROTECTED %s misc-non-private-member-variables-in-classes %t -// RUN: %check_clang_tidy -check-suffixes=PUBLIC,NONPRIVATE,PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: [{key: misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables, value: false}, {key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic, value: false}]}' -- -// RUN: %check_clang_tidy -check-suffixes=PUBLIC,PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: [{key: misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables, value: false}, {key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic, value: true}]}' -- +// RUN: %check_clang_tidy -check-suffixes=PUBLIC,NONPRIVATE,PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: {misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables: false, misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic: false}}' -- +// RUN: %check_clang_tidy -check-suffixes=PUBLIC,PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: {misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables: false, misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic: true}}' -- // RUN: %check_clang_tidy -check-suffixes=PUBLIC,PROTECTED %s cppcoreguidelines-non-private-member-variables-in-classes %t -- -- -// RUN: %check_clang_tidy -check-suffixes=PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: [{key: misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables, value: true}, {key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic, value: false}]}' -- -// RUN: %check_clang_tidy -check-suffixes=PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: [{key: misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables, value: true}, {key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic, value: true}]}' -- +// RUN: %check_clang_tidy -check-suffixes=PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: {misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables: true, misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic: false}}' -- +// RUN: %check_clang_tidy -check-suffixes=PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: {misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables: true, misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic: true}}' -- //----------------------------------------------------------------------------// diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-strict.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-strict.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-strict.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s misc-unused-parameters %t -- \ -// RUN: -config="{CheckOptions: [{key: StrictMode, value: true}]}" -- +// RUN: -config="{CheckOptions: {StrictMode: true}}" -- // Warn on empty function bodies in StrictMode. namespace strict_mode { diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-bind-permissive-parameter-list.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-bind-permissive-parameter-list.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-bind-permissive-parameter-list.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-bind-permissive-parameter-list.cpp @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy -std=c++14-or-later %s modernize-avoid-bind %t -- \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: modernize-avoid-bind.PermissiveParameterList, value: true}]}" -- +// RUN: -config="{CheckOptions: { \ +// RUN: modernize-avoid-bind.PermissiveParameterList: true}}" -- namespace std { inline namespace impl { diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-extern-c.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-extern-c.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-extern-c.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-extern-c.cpp @@ -14,7 +14,7 @@ // RUN: %check_clang_tidy -std=c++11 %s modernize-deprecated-headers %t \ // RUN: -check-suffixes=DEFAULT,CHECK-HEADER-FILE \ -// RUN: -config="{CheckOptions: [{key: modernize-deprecated-headers.CheckHeaderFile, value: 'true'}]}" \ +// RUN: -config="{CheckOptions: {modernize-deprecated-headers.CheckHeaderFile: 'true'}}" \ // RUN: --header-filter='.*' --system-headers \ // RUN: -- -I %t/usr -isystem %t/sys -isystem %S/Inputs/deprecated-headers diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-camelback.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-camelback.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-camelback.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-camelback.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-loop-convert %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-loop-convert.NamingStyle, value: 'camelBack'}]}" \ +// RUN: -config="{CheckOptions: {modernize-loop-convert.NamingStyle: 'camelBack'}}" \ // RUN: -- -I %S/Inputs/loop-convert #include "structures.h" diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-lowercase.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-lowercase.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-lowercase.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-lowercase.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-loop-convert %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-loop-convert.NamingStyle, value: 'lower_case'}]}" \ +// RUN: -config="{CheckOptions: {modernize-loop-convert.NamingStyle: 'lower_case'}}" \ // RUN: -- -I %S/Inputs/loop-convert #include "structures.h" diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-reverse.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-reverse.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-reverse.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-reverse.cpp @@ -1,31 +1,31 @@ // RUN: %check_clang_tidy -std=c++20 -check-suffixes=,RANGES %s modernize-loop-convert %t // RUN: %check_clang_tidy -check-suffixes=,CUSTOM,CUSTOM-NO-SYS %s modernize-loop-convert %t -- \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: modernize-loop-convert.MakeReverseRangeFunction, value: 'llvm::reverse'}, \ -// RUN: {key: modernize-loop-convert.MakeReverseRangeHeader, value: 'llvm/ADT/STLExtras.h'}]}" +// RUN: -config="{CheckOptions: { \ +// RUN: modernize-loop-convert.MakeReverseRangeFunction: 'llvm::reverse', \ +// RUN: modernize-loop-convert.MakeReverseRangeHeader: 'llvm/ADT/STLExtras.h'}}" // RUN: %check_clang_tidy -check-suffixes=,CUSTOM,CUSTOM-SYS %s modernize-loop-convert %t -- \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: modernize-loop-convert.MakeReverseRangeFunction, value: 'llvm::reverse'}, \ -// RUN: {key: modernize-loop-convert.MakeReverseRangeHeader, value: ''}]}" +// RUN: -config="{CheckOptions: { \ +// RUN: modernize-loop-convert.MakeReverseRangeFunction: 'llvm::reverse', \ +// RUN: modernize-loop-convert.MakeReverseRangeHeader: ''}}" // RUN: %check_clang_tidy -check-suffixes=,CUSTOM,CUSTOM-NO-HEADER %s modernize-loop-convert %t -- \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: modernize-loop-convert.MakeReverseRangeFunction, value: 'llvm::reverse'}]}" +// RUN: -config="{CheckOptions: { \ +// RUN: modernize-loop-convert.MakeReverseRangeFunction: 'llvm::reverse'}}" // Ensure the check doesn't transform reverse loops when not in c++20 mode or // when UseCxx20ReverseRanges has been disabled // RUN: clang-tidy %s -checks=-*,modernize-loop-convert -- -std=c++17 | count 0 // RUN: clang-tidy %s -checks=-*,modernize-loop-convert -config="{CheckOptions: \ -// RUN: [{key: modernize-loop-convert.UseCxx20ReverseRanges, value: 'false'}] \ +// RUN: {modernize-loop-convert.UseCxx20ReverseRanges: 'false'} \ // RUN: }" -- -std=c++20 | count 0 // Ensure we get a warning if we supply the header argument without the // function argument. -// RUN: clang-tidy %s -checks=-*,modernize-loop-convert -config="{CheckOptions: [ \ -// RUN: {key: modernize-loop-convert.MakeReverseRangeHeader, value: 'llvm/ADT/STLExtras.h'}]}" \ +// RUN: clang-tidy %s -checks=-*,modernize-loop-convert -config="{CheckOptions: { \ +// RUN: modernize-loop-convert.MakeReverseRangeHeader: 'llvm/ADT/STLExtras.h'}}" \ // RUN: -- -std=c++17 2>&1 \ // RUN: | FileCheck %s -check-prefix=CHECK-HEADER-NO-FUNC \ // RUN: -implicit-check-not="{{warning|error}}:" diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-uppercase.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-uppercase.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-uppercase.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-uppercase.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-loop-convert %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-loop-convert.NamingStyle, value: 'UPPER_CASE'}]}" \ +// RUN: -config="{CheckOptions: {modernize-loop-convert.NamingStyle: 'UPPER_CASE'}}" \ // RUN: -- -I %S/Inputs/loop-convert #include "structures.h" diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared-header.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared-header.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared-header.cpp @@ -1,10 +1,8 @@ // RUN: %check_clang_tidy %s modernize-make-shared %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: modernize-make-shared.MakeSmartPtrFunction, \ -// RUN: value: 'my::MakeShared'}, \ -// RUN: {key: modernize-make-shared.MakeSmartPtrFunctionHeader, \ -// RUN: value: 'make_shared_util.h'} \ -// RUN: ]}" \ +// RUN: {modernize-make-shared.MakeSmartPtrFunction: 'my::MakeShared', \ +// RUN: modernize-make-shared.MakeSmartPtrFunctionHeader: 'make_shared_util.h' \ +// RUN: }}" \ // RUN: -- -I %S/Inputs/smart-ptr #include "shared_ptr.h" diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-default-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-default-init.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-default-init.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-default-init.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy -std=c++14-or-later %s modernize-make-unique %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: modernize-make-unique.IgnoreDefaultInitialization, \ -// RUN: value: 'false'}] \ +// RUN: {modernize-make-unique.IgnoreDefaultInitialization: \ +// RUN: 'false'}} \ // RUN: }" \ // RUN: -- -I %S/Inputs/smart-ptr diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-header.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-header.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-header.cpp @@ -1,10 +1,8 @@ // RUN: %check_clang_tidy %s modernize-make-unique %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: modernize-make-unique.MakeSmartPtrFunction, \ -// RUN: value: 'my::MakeUnique'}, \ -// RUN: {key: modernize-make-unique.MakeSmartPtrFunctionHeader, \ -// RUN: value: 'make_unique_util.h'} \ -// RUN: ]}" \ +// RUN: {modernize-make-unique.MakeSmartPtrFunction: 'my::MakeUnique', \ +// RUN: modernize-make-unique.MakeSmartPtrFunctionHeader: 'make_unique_util.h' \ +// RUN: }}" \ // RUN: -- -I %S/Inputs/smart-ptr #include "unique_ptr.h" diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-macros.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-macros.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-macros.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy -std=c++14-or-later %s modernize-make-unique %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-make-unique.IgnoreMacros, value: false}]}" \ +// RUN: -config="{CheckOptions: {modernize-make-unique.IgnoreMacros: false}}" \ // RUN: -- -I %S/Inputs/smart-ptr #include "unique_ptr.h" diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal-delimiter.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal-delimiter.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal-delimiter.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal-delimiter.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s modernize-raw-string-literal %t -- -config='{CheckOptions: [{key: "modernize-raw-string-literal.DelimiterStem", value: "str"}, {key: modernize-raw-string-literal.ReplaceShorterLiterals, value: true}]}' +// RUN: %check_clang_tidy %s modernize-raw-string-literal %t -- -config='{CheckOptions: {modernize-raw-string-literal.DelimiterStem: "str", modernize-raw-string-literal.ReplaceShorterLiterals: true}}' char const *const ContainsSentinel{"who\\ops)\""}; // CHECK-MESSAGES: :[[@LINE-1]]:36: warning: {{.*}} can be written as a raw string literal diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s modernize-raw-string-literal %t -- -config="{CheckOptions: [{key: modernize-raw-string-literal.ReplaceShorterLiterals, value: true}]}" +// RUN: %check_clang_tidy %s modernize-raw-string-literal %t -- -config="{CheckOptions: {modernize-raw-string-literal.ReplaceShorterLiterals: true}}" char const *const BackSlash("goink\\frob"); // CHECK-MESSAGES: :[[@LINE-1]]:29: warning: escaped string literal can be written as a raw string literal [modernize-raw-string-literal] diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/replace-disallow-copy-and-assign-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/replace-disallow-copy-and-assign-macro.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/replace-disallow-copy-and-assign-macro.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/replace-disallow-copy-and-assign-macro.cpp @@ -3,25 +3,25 @@ // RUN: %check_clang_tidy -format-style=LLVM -check-suffix=DIFFERENT-NAME %s \ // RUN: modernize-replace-disallow-copy-and-assign-macro %t \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: modernize-replace-disallow-copy-and-assign-macro.MacroName, \ -// RUN: value: MY_MACRO_NAME}]}" +// RUN: -config="{CheckOptions: { \ +// RUN: modernize-replace-disallow-copy-and-assign-macro.MacroName: \ +// RUN: MY_MACRO_NAME}}" // RUN: %check_clang_tidy -format-style=LLVM -check-suffix=FINALIZE %s \ // RUN: modernize-replace-disallow-copy-and-assign-macro %t \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: modernize-replace-disallow-copy-and-assign-macro.MacroName, \ -// RUN: value: DISALLOW_COPY_AND_ASSIGN_FINALIZE}]}" +// RUN: -config="{CheckOptions: { \ +// RUN: modernize-replace-disallow-copy-and-assign-macro.MacroName: \ +// RUN: DISALLOW_COPY_AND_ASSIGN_FINALIZE}}" // RUN: clang-tidy %s -checks="-*,modernize-replace-disallow-copy-and-assign-macro" \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: modernize-replace-disallow-copy-and-assign-macro.MacroName, \ -// RUN: value: DISALLOW_COPY_AND_ASSIGN_MORE_AGUMENTS}]}" -- -Wno-extra-semi | count 0 +// RUN: -config="{CheckOptions: { \ +// RUN: modernize-replace-disallow-copy-and-assign-macro.MacroName: \ +// RUN: DISALLOW_COPY_AND_ASSIGN_MORE_AGUMENTS}}" -- -Wno-extra-semi | count 0 // RUN: clang-tidy %s -checks="-*,modernize-replace-disallow-copy-and-assign-macro" \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: modernize-replace-disallow-copy-and-assign-macro.MacroName, \ -// RUN: value: DISALLOW_COPY_AND_ASSIGN_NEEDS_PREEXPANSION}]}" -- -Wno-extra-semi | count 0 +// RUN: -config="{CheckOptions: { \ +// RUN: modernize-replace-disallow-copy-and-assign-macro.MacroName: \ +// RUN: DISALLOW_COPY_AND_ASSIGN_NEEDS_PREEXPANSION}}" -- -Wno-extra-semi | count 0 // Note: the last two tests expect no diagnostics, but FileCheck cannot handle // that, hence the use of | count 0. diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast-remove-stars.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast-remove-stars.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast-remove-stars.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast-remove-stars.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-auto %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: 'true'} , {key: modernize-use-auto.MinTypeNameLength, value: '0'}]}" \ +// RUN: -config="{CheckOptions: {modernize-use-auto.RemoveStars: 'true' , modernize-use-auto.MinTypeNameLength: '0'}}" \ // RUN: -- -frtti struct A { diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-auto %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-auto.MinTypeNameLength, value: '0'}]}" \ +// RUN: -config="{CheckOptions: {modernize-use-auto.MinTypeNameLength: '0'}}" \ // RUN: -- -I %S/Inputs/use-auto -frtti struct A { diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-min-type-name-length.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-min-type-name-length.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-min-type-name-length.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-min-type-name-length.cpp @@ -1,7 +1,7 @@ -// RUN: %check_clang_tidy -check-suffix=0-0 %s modernize-use-auto %t -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: false}, {key: modernize-use-auto.MinTypeNameLength, value: 0}]}" -- -frtti -// RUN: %check_clang_tidy -check-suffix=0-8 %s modernize-use-auto %t -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: false}, {key: modernize-use-auto.MinTypeNameLength, value: 8}]}" -- -frtti -// RUN: %check_clang_tidy -check-suffix=1-0 %s modernize-use-auto %t -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: true}, {key: modernize-use-auto.MinTypeNameLength, value: 0}]}" -- -frtti -// RUN: %check_clang_tidy -check-suffix=1-8 %s modernize-use-auto %t -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: true}, {key: modernize-use-auto.MinTypeNameLength, value: 8}]}" -- -frtti +// RUN: %check_clang_tidy -check-suffix=0-0 %s modernize-use-auto %t -- -config="{CheckOptions: {modernize-use-auto.RemoveStars: false, modernize-use-auto.MinTypeNameLength: 0}}" -- -frtti +// RUN: %check_clang_tidy -check-suffix=0-8 %s modernize-use-auto %t -- -config="{CheckOptions: {modernize-use-auto.RemoveStars: false, modernize-use-auto.MinTypeNameLength: 8}}" -- -frtti +// RUN: %check_clang_tidy -check-suffix=1-0 %s modernize-use-auto %t -- -config="{CheckOptions: {modernize-use-auto.RemoveStars: true, modernize-use-auto.MinTypeNameLength: 0}}" -- -frtti +// RUN: %check_clang_tidy -check-suffix=1-8 %s modernize-use-auto %t -- -config="{CheckOptions: {modernize-use-auto.RemoveStars: true, modernize-use-auto.MinTypeNameLength: 8}}" -- -frtti template extern T foo(); template struct P { explicit P(T t) : t_(t) {} T t_;}; diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new-remove-stars.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new-remove-stars.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new-remove-stars.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new-remove-stars.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-auto %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: 'true'}, {key: modernize-use-auto.MinTypeNameLength, value: '0'}]}" +// RUN: -config="{CheckOptions: {modernize-use-auto.RemoveStars: 'true', modernize-use-auto.MinTypeNameLength: '0'}}" class MyType {}; diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-auto %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-auto.MinTypeNameLength, value: '0'}]}" \ +// RUN: -config="{CheckOptions: {modernize-use-auto.MinTypeNameLength: '0'}}" \ // RUN: -- -frtti class MyType {}; diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals-ignore-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals-ignore-macros.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals-ignore-macros.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals-ignore-macros.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s modernize-use-bool-literals %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: modernize-use-bool-literals.IgnoreMacros, \ -// RUN: value: true}]}" +// RUN: {modernize-use-bool-literals.IgnoreMacros: \ +// RUN: true}}" bool IntToTrue = 1; // CHECK-MESSAGES: :[[@LINE-1]]:18: warning: converting integer literal to bool, use bool literal instead [modernize-use-bool-literals] diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s modernize-use-bool-literals %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: modernize-use-bool-literals.IgnoreMacros, \ -// RUN: value: false}]}" +// RUN: {modernize-use-bool-literals.IgnoreMacros: \ +// RUN: false}}" bool IntToTrue = 1; // CHECK-MESSAGES: :[[@LINE-1]]:18: warning: converting integer literal to bool, use bool literal instead [modernize-use-bool-literals] diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-assignment.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-assignment.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-assignment.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-default-member-init %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-default-member-init.UseAssignment, value: true}]}" +// RUN: -config="{CheckOptions: {modernize-use-default-member-init.UseAssignment: true}}" struct S { }; diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-macros.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-macros.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-macros.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-default-member-init %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-default-member-init.IgnoreMacros, value: false}]}" +// RUN: -config="{CheckOptions: {modernize-use-default-member-init.IgnoreMacros: false}}" #define MACRO() \ struct S { \ diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace-ignore-implicit-constructors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace-ignore-implicit-constructors.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace-ignore-implicit-constructors.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace-ignore-implicit-constructors.cpp @@ -1,8 +1,7 @@ // RUN: %check_clang_tidy %s modernize-use-emplace %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: modernize-use-emplace.IgnoreImplicitConstructors, \ -// RUN: value: true}] \ -// RUN: }" +// RUN: {modernize-use-emplace.IgnoreImplicitConstructors: \ +// RUN: true}}" namespace std { template diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace.cpp @@ -1,12 +1,11 @@ // RUN: %check_clang_tidy %s modernize-use-emplace %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: modernize-use-emplace.ContainersWithPushBack, \ -// RUN: value: '::std::vector; ::std::list; ::std::deque; llvm::LikeASmallVector'}, \ -// RUN: {key: modernize-use-emplace.TupleTypes, \ -// RUN: value: '::std::pair; std::tuple; ::test::Single'}, \ -// RUN: {key: modernize-use-emplace.TupleMakeFunctions, \ -// RUN: value: '::std::make_pair; ::std::make_tuple; ::test::MakeSingle'}] \ -// RUN: }" +// RUN: {modernize-use-emplace.ContainersWithPushBack: \ +// RUN: '::std::vector; ::std::list; ::std::deque; llvm::LikeASmallVector', \ +// RUN: modernize-use-emplace.TupleTypes: \ +// RUN: '::std::pair; std::tuple; ::test::Single', \ +// RUN: modernize-use-emplace.TupleMakeFunctions: \ +// RUN: '::std::make_pair; ::std::make_tuple; ::test::MakeSingle'}}" namespace std { template diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-copy.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-copy.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-copy.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-copy.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-equals-default %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-equals-default.IgnoreMacros, value: false}]}" \ +// RUN: -config="{CheckOptions: {modernize-use-equals-default.IgnoreMacros: false}}" \ // RUN: -- -fno-delayed-template-parsing -fexceptions // Out of line definition. diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-macros.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-macros.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-macros.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-equals-default %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-equals-default.IgnoreMacros, value: false}]}" +// RUN: -config="{CheckOptions: {modernize-use-equals-default.IgnoreMacros: false}}" #define STRUCT_WITH_DEFAULT(_base, _type) \ struct _type { \ diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-delete-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-delete-macros.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-delete-macros.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-delete-macros.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-equals-delete %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-equals-delete.IgnoreMacros, value: false}]}" +// RUN: -config="{CheckOptions: {modernize-use-equals-delete.IgnoreMacros: false}}" #define MACRO(type) void operator=(type const &) class C { diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-clang-unused.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-clang-unused.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-clang-unused.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-clang-unused.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-nodiscard %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-nodiscard.ReplacementString, value: '[[clang::warn_unused_result]]'}]}" +// RUN: -config="{CheckOptions: {modernize-use-nodiscard.ReplacementString: '[[clang::warn_unused_result]]'}}" class Foo { diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-cxx11.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-cxx11.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-cxx11.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-nodiscard %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-nodiscard.ReplacementString, value: '__attribute__((warn_unused_result))'}]}" +// RUN: -config="{CheckOptions: {modernize-use-nodiscard.ReplacementString: '__attribute__((warn_unused_result))'}}" class Foo { diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-gcc-unused.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-gcc-unused.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-gcc-unused.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-gcc-unused.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-nodiscard %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-nodiscard.ReplacementString, value: '[[gcc::warn_unused_result]]'}]}" +// RUN: -config="{CheckOptions: {modernize-use-nodiscard.ReplacementString: '[[gcc::warn_unused_result]]'}}" class Foo { diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-no-macro-inscope-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-no-macro-inscope-cxx11.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-no-macro-inscope-cxx11.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-no-macro-inscope-cxx11.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-nodiscard %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-nodiscard.ReplacementString, value: 'CUSTOM_NO_DISCARD'}]}" +// RUN: -config="{CheckOptions: {modernize-use-nodiscard.ReplacementString: 'CUSTOM_NO_DISCARD'}}" // As if the macro was not defined. // #define CUSTOM_NO_DISCARD __attribute_((warn_unused_result)) diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy -std=c++17-or-later %s modernize-use-nodiscard %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-nodiscard.ReplacementString, value: 'NO_DISCARD'}]}" +// RUN: -config="{CheckOptions: {modernize-use-nodiscard.ReplacementString: 'NO_DISCARD'}}" namespace std { template diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-macro.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-macro.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-macro.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy -std=c++11,c++14 %s modernize-use-noexcept %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-noexcept.ReplacementString, value: 'NOEXCEPT'}]}" \ +// RUN: -config="{CheckOptions: {modernize-use-noexcept.ReplacementString: 'NOEXCEPT'}}" \ // RUN: -- -fexceptions // This test is not run in C++17 or later because dynamic exception // specifications were removed in C++17. diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-opt.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-opt.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-opt.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-opt.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy -std=c++11,c++14 %s modernize-use-noexcept %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-noexcept.UseNoexceptFalse, value: false}]}" \ +// RUN: -config="{CheckOptions: {modernize-use-noexcept.UseNoexceptFalse: false}}" \ // RUN: -- -fexceptions // This test is not run in C++17 or later because dynamic exception // specifications were removed in C++17. diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-nullptr %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-nullptr.NullMacros, value: 'MY_NULL,NULL'}]}" +// RUN: -config="{CheckOptions: {modernize-use-nullptr.NullMacros: 'MY_NULL,NULL'}}" #define NULL 0 diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-allow-override-and-final.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-allow-override-and-final.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-allow-override-and-final.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-allow-override-and-final.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-override %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-override.AllowOverrideAndFinal, value: true}]}" +// RUN: -config="{CheckOptions: {modernize-use-override.AllowOverrideAndFinal: true}}" struct Base { virtual ~Base(); diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-no-destructors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-no-destructors.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-no-destructors.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-no-destructors.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-override %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-override.IgnoreDestructors, value: true}]}" +// RUN: -config="{CheckOptions: {modernize-use-override.IgnoreDestructors: true}}" struct Base { virtual ~Base(); diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-macro.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-macro.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-macro.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-override %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-override.OverrideSpelling, value: 'OVERRIDE'},{key: modernize-use-override.FinalSpelling, value: 'FINAL'}]}" +// RUN: -config="{CheckOptions: {modernize-use-override.OverrideSpelling: 'OVERRIDE',modernize-use-override.FinalSpelling: 'FINAL'}}" #define ABSTRACT = 0 diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-no-macro-inscope.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-no-macro-inscope.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-no-macro-inscope.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-no-macro-inscope.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-override %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-override.OverrideSpelling, value: 'CUSTOM_OVERRIDE'},{key: modernize-use-override.FinalSpelling, value: 'CUSTOM_FINAL'}]}" +// RUN: -config="{CheckOptions: {modernize-use-override.OverrideSpelling: 'CUSTOM_OVERRIDE',modernize-use-override.FinalSpelling: 'CUSTOM_FINAL'}}" // As if the macro was not defined. //#define CUSTOM_OVERRIDE override diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-using-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-using-macros.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-using-macros.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-using-macros.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s modernize-use-using %t -- \ -// RUN: -config="{CheckOptions: [{key: modernize-use-using.IgnoreMacros, value: false}]}" +// RUN: -config="{CheckOptions: {modernize-use-using.IgnoreMacros: false}}" #define CODE typedef int INT diff --git a/clang-tools-extra/test/clang-tidy/checkers/objc/forbidden-subclassing-custom.m b/clang-tools-extra/test/clang-tidy/checkers/objc/forbidden-subclassing-custom.m --- a/clang-tools-extra/test/clang-tidy/checkers/objc/forbidden-subclassing-custom.m +++ b/clang-tools-extra/test/clang-tidy/checkers/objc/forbidden-subclassing-custom.m @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s objc-forbidden-subclassing %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: objc-forbidden-subclassing.ClassNames, value: "Foo;Quux"}]}' \ +// RUN: {objc-forbidden-subclassing.ClassNames: "Foo;Quux"}}' \ // RUN: -- @interface UIImagePickerController diff --git a/clang-tools-extra/test/clang-tidy/checkers/openmp/exception-escape.cpp b/clang-tools-extra/test/clang-tidy/checkers/openmp/exception-escape.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/openmp/exception-escape.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/openmp/exception-escape.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s openmp-exception-escape %t -- -extra-arg=-fopenmp=libomp -extra-arg=-fexceptions -config="{CheckOptions: [{key: openmp-exception-escape.IgnoredExceptions, value: 'ignored, ignored2'}]}" -- +// RUN: %check_clang_tidy %s openmp-exception-escape %t -- -extra-arg=-fopenmp=libomp -extra-arg=-fexceptions -config="{CheckOptions: {openmp-exception-escape.IgnoredExceptions: 'ignored, ignored2'}}" -- int thrower() { throw 42; diff --git a/clang-tools-extra/test/clang-tidy/checkers/performance/faster-string-find.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/faster-string-find.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/performance/faster-string-find.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/performance/faster-string-find.cpp @@ -1,8 +1,8 @@ // RUN: %check_clang_tidy %s performance-faster-string-find %t // RUN: %check_clang_tidy -check-suffix=CUSTOM %s performance-faster-string-find %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: performance-faster-string-find.StringLikeClasses, \ -// RUN: value: '::llvm::StringRef;'}]}" +// RUN: {performance-faster-string-find.StringLikeClasses: \ +// RUN: '::llvm::StringRef;'}}" namespace std { template diff --git a/clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-allowed-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-allowed-types.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-allowed-types.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-allowed-types.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s performance-for-range-copy %t -- \ -// RUN: -config="{CheckOptions: [{key: performance-for-range-copy.AllowedTypes, value: '[Pp]ointer$;[Pp]tr$;[Rr]ef(erence)?$;qualified::Type;::fully::QualifiedType'}]}" \ +// RUN: -config="{CheckOptions: {performance-for-range-copy.AllowedTypes: '[Pp]ointer$;[Pp]tr$;[Rr]ef(erence)?$;qualified::Type;::fully::QualifiedType'}}" \ // RUN: -- -fno-delayed-template-parsing template diff --git a/clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-warn-on-all-auto-copies.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-warn-on-all-auto-copies.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-warn-on-all-auto-copies.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-warn-on-all-auto-copies.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s performance-for-range-copy %t -- \ -// RUN: -config="{CheckOptions: [{key: "performance-for-range-copy.WarnOnAllAutoCopies", value: true}]}" +// RUN: -config="{CheckOptions: {performance-for-range-copy.WarnOnAllAutoCopies: true}}" template struct Iterator { diff --git a/clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-vector-operation.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-vector-operation.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-vector-operation.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-vector-operation.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s performance-inefficient-vector-operation %t -- \ // RUN: -format-style=llvm \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: performance-inefficient-vector-operation.EnableProto, value: true}]}' +// RUN: {performance-inefficient-vector-operation.EnableProto: true}}' namespace std { diff --git a/clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-const-ref.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-const-ref.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-const-ref.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-const-ref.cpp @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s performance-move-const-arg %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: performance-move-const-arg.CheckMoveToConstRef, value: false}]}' +// RUN: {performance-move-const-arg.CheckMoveToConstRef: false}}' namespace std { template diff --git a/clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-trivially-copyable.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-trivially-copyable.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-trivially-copyable.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-trivially-copyable.cpp @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s performance-move-const-arg %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: performance-move-const-arg.CheckTriviallyCopyableMove, value: false}]}' +// RUN: {performance-move-const-arg.CheckTriviallyCopyableMove: false}}' namespace std { diff --git a/clang-tools-extra/test/clang-tidy/checkers/performance/move-constructor-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/move-constructor-init.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/performance/move-constructor-init.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/performance/move-constructor-init.cpp @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s performance-move-constructor-init,modernize-pass-by-value %t -- \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: modernize-pass-by-value.ValuesOnly, value: true}]}' \ +// RUN: {modernize-pass-by-value.ValuesOnly: true}}' \ // RUN: -- -isystem %clang_tidy_headers #include diff --git a/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-allowed-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-allowed-types.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-allowed-types.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-allowed-types.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s performance-unnecessary-copy-initialization %t -- -config="{CheckOptions: [{key: performance-unnecessary-copy-initialization.AllowedTypes, value: '[Pp]ointer$;[Pp]tr$;[Rr]ef(erence)?$'}]}" -- +// RUN: %check_clang_tidy %s performance-unnecessary-copy-initialization %t -- -config="{CheckOptions: {performance-unnecessary-copy-initialization.AllowedTypes: '[Pp]ointer$;[Pp]tr$;[Rr]ef(erence)?$'}}" -- struct SmartPointer { ~SmartPointer(); diff --git a/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-excluded-container-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-excluded-container-types.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-excluded-container-types.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-excluded-container-types.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s performance-unnecessary-copy-initialization %t -- -config="{CheckOptions: [{key: performance-unnecessary-copy-initialization.ExcludedContainerTypes, value: 'ns::ViewType$;::ConstInCorrectType$'}]}" -- +// RUN: %check_clang_tidy %s performance-unnecessary-copy-initialization %t -- -config="{CheckOptions: {performance-unnecessary-copy-initialization.ExcludedContainerTypes: 'ns::ViewType$;::ConstInCorrectType$'}}" -- namespace ns { template diff --git a/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-allowed-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-allowed-types.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-allowed-types.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-allowed-types.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s performance-unnecessary-value-param %t -- -config="{CheckOptions: [{key: performance-unnecessary-value-param.AllowedTypes, value: '[Pp]ointer$;[Pp]tr$;[Rr]ef(erence)?$'}]}" -- +// RUN: %check_clang_tidy %s performance-unnecessary-value-param %t -- -config="{CheckOptions: {performance-unnecessary-value-param.AllowedTypes: '[Pp]ointer$;[Pp]tr$;[Rr]ef(erence)?$'}}" -- struct SmartPointer { ~SmartPointer(); diff --git a/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-allow.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-allow.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-allow.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-allow.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s portability-restrict-system-includes %t \ -// RUN: -- -config="{CheckOptions: [{key: portability-restrict-system-includes.Includes, value: '*,-stddef.h'}]}" \ +// RUN: -- -config="{CheckOptions: {portability-restrict-system-includes.Includes: '*,-stddef.h'}}" \ // RUN: -- -isystem %S/Inputs/restrict-system-includes/system // Test block-list functionality: allow all but stddef.h. diff --git a/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-disallow.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-disallow.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-disallow.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-disallow.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s portability-restrict-system-includes %t \ -// RUN: -- -config="{CheckOptions: [{key: portability-restrict-system-includes.Includes, value: '-*,stddef.h'}]}" \ +// RUN: -- -config="{CheckOptions: {portability-restrict-system-includes.Includes: '-*,stddef.h'}}" \ // RUN: -- -isystem %S/Inputs/restrict-system-includes/system // Test allow-list functionality: disallow all but stddef.h. diff --git a/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-glob.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-glob.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-glob.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-glob.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s portability-restrict-system-includes %t \ -// RUN: -- -config="{CheckOptions: [{key: portability-restrict-system-includes.Includes, value: '-*,std*.h'}]}" \ +// RUN: -- -config="{CheckOptions: {portability-restrict-system-includes.Includes: '-*,std*.h'}}" \ // RUN: -- -isystem %S/Inputs/restrict-system-includes/system // Test glob functionality: disallow all headers except those that match diff --git a/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-transitive.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-transitive.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-transitive.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-transitive.cpp @@ -2,7 +2,7 @@ // RUN: mkdir %T/Headers // RUN: cp -r %S/Inputs/restrict-system-includes %T/Headers/portability-restrict-system-includes // RUN: %check_clang_tidy -std=c++11 %s portability-restrict-system-includes %t \ -// RUN: -- -config="{CheckOptions: [{key: portability-restrict-system-includes.Includes, value: 'transitive.h,s.h'}]}" \ +// RUN: -- -config="{CheckOptions: {portability-restrict-system-includes.Includes: 'transitive.h,s.h'}}" \ // RUN: -system-headers -header-filter=.* \ // RUN: -- -I %T/Headers/portability-restrict-system-includes -isystem %T/Headers/portability-restrict-system-includes/system // RUN: FileCheck -input-file=%T/Headers/portability-restrict-system-includes/transitive2.h %s -check-prefix=CHECK-FIXES diff --git a/clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-ppc.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-ppc.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-ppc.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-ppc.cpp @@ -1,15 +1,15 @@ // RUN: %check_clang_tidy -std=c++11-or-later %s portability-simd-intrinsics %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: portability-simd-intrinsics.Suggest, value: false} \ -// RUN: ]}' -- -target ppc64le -maltivec +// RUN: -config='{CheckOptions: {\ +// RUN: portability-simd-intrinsics.Suggest: false \ +// RUN: }}' -- -target ppc64le -maltivec // RUN: %check_clang_tidy -std=c++11,c++14,c++17 %s portability-simd-intrinsics -check-suffix=BEFORE-CXX20 %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: portability-simd-intrinsics.Suggest, value: true} \ -// RUN: ]}' -- -target ppc64le -maltivec +// RUN: -config='{CheckOptions: { \ +// RUN: portability-simd-intrinsics.Suggest: true \ +// RUN: }}' -- -target ppc64le -maltivec // RUN: %check_clang_tidy -std=c++20-or-later %s portability-simd-intrinsics -check-suffix=CXX20 %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: portability-simd-intrinsics.Suggest, value: true} \ -// RUN: ]}' -- -target ppc64le -maltivec +// RUN: -config='{CheckOptions: { \ +// RUN: portability-simd-intrinsics.Suggest: true \ +// RUN: }}' -- -target ppc64le -maltivec vector int vec_add(vector int, vector int); diff --git a/clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-x86.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-x86.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-x86.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-x86.cpp @@ -1,15 +1,15 @@ // RUN: %check_clang_tidy -std=c++11-or-later %s portability-simd-intrinsics %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: portability-simd-intrinsics.Suggest, value: false} \ -// RUN: ]}' -- -target x86_64 +// RUN: -config='{CheckOptions: { \ +// RUN: portability-simd-intrinsics.Suggest: false \ +// RUN: }}' -- -target x86_64 // RUN: %check_clang_tidy -std=c++11,c++14,c++17 %s portability-simd-intrinsics -check-suffix=BEFORE-CXX20 %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: portability-simd-intrinsics.Suggest, value: true} \ -// RUN: ]}' -- -target x86_64 +// RUN: -config='{CheckOptions: { \ +// RUN: portability-simd-intrinsics.Suggest: true \ +// RUN: }}' -- -target x86_64 // RUN: %check_clang_tidy -std=c++20-or-later %s portability-simd-intrinsics -check-suffix=CXX20 %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: portability-simd-intrinsics.Suggest, value: true} \ -// RUN: ]}' -- -target x86_64 +// RUN: -config='{CheckOptions: { \ +// RUN: portability-simd-intrinsics.Suggest: true \ +// RUN: }}' -- -target x86_64 typedef long long __m128i __attribute__((vector_size(16))); typedef double __m256 __attribute__((vector_size(32))); diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style1/.clang-tidy b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style1/.clang-tidy --- a/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style1/.clang-tidy +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style1/.clang-tidy @@ -1,7 +1,5 @@ Checks: readability-identifier-naming CheckOptions: - - key: readability-identifier-naming.GlobalFunctionCase - value: lower_case - - key: readability-identifier-naming.IgnoreMainLikeFunctions - value: true + readability-identifier-naming.GlobalFunctionCase: lower_case + readability-identifier-naming.IgnoreMainLikeFunctions: true diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style2/.clang-tidy b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style2/.clang-tidy --- a/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style2/.clang-tidy +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style2/.clang-tidy @@ -1,7 +1,5 @@ Checks: readability-identifier-naming CheckOptions: - - key: readability-identifier-naming.GlobalFunctionCase - value: UPPER_CASE - - key: readability-identifier-naming.IgnoreMainLikeFunctions - value: false + readability-identifier-naming.GlobalFunctionCase: UPPER_CASE + readability-identifier-naming.IgnoreMainLikeFunctions: false diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation1/.clang-tidy b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation1/.clang-tidy --- a/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation1/.clang-tidy +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation1/.clang-tidy @@ -1,114 +1,58 @@ Checks: readability-identifier-naming CheckOptions: - - key: readability-identifier-naming.AbstractClassCase - value: CamelCase - - key: readability-identifier-naming.ClassCase - value: CamelCase - - key: readability-identifier-naming.ClassConstantCase - value: CamelCase - - key: readability-identifier-naming.ClassMemberCase - value: CamelCase - - key: readability-identifier-naming.ConstantCase - value: CamelCase - - key: readability-identifier-naming.ConstantMemberCase - value: CamelCase - - key: readability-identifier-naming.ConstantParameterCase - value: CamelCase - - key: readability-identifier-naming.ConstantPointerParameterCase - value: CamelCase - - key: readability-identifier-naming.ConstexprVariableCase - value: CamelCase - - key: readability-identifier-naming.EnumConstantCase - value: CamelCase - - key: readability-identifier-naming.GlobalConstantCase - value: CamelCase - - key: readability-identifier-naming.GlobalConstantPointerCase - value: CamelCase - - key: readability-identifier-naming.GlobalPointerCase - value: CamelCase - - key: readability-identifier-naming.GlobalVariableCase - value: CamelCase - - key: readability-identifier-naming.LocalConstantCase - value: CamelCase - - key: readability-identifier-naming.LocalConstantPointerCase - value: CamelCase - - key: readability-identifier-naming.LocalPointerCase - value: CamelCase - - key: readability-identifier-naming.LocalVariableCase - value: CamelCase - - key: readability-identifier-naming.MemberCase - value: CamelCase - - key: readability-identifier-naming.ParameterCase - value: CamelCase - - key: readability-identifier-naming.PointerParameterCase - value: CamelCase - - key: readability-identifier-naming.PrivateMemberCase - value: CamelCase - - key: readability-identifier-naming.ProtectedMemberCase - value: CamelCase - - key: readability-identifier-naming.PublicMemberCase - value: CamelCase - - key: readability-identifier-naming.ScopedEnumConstantCase - value: CamelCase - - key: readability-identifier-naming.StaticConstantCase - value: CamelCase - - key: readability-identifier-naming.StaticVariableCase - value: CamelCase - - key: readability-identifier-naming.VariableCase - value: CamelCase - - key: readability-identifier-naming.AbstractClassHungarianPrefix - value: On - - key: readability-identifier-naming.ClassHungarianPrefix - value: On - - key: readability-identifier-naming.ClassConstantHungarianPrefix - value: On - - key: readability-identifier-naming.ClassMemberHungarianPrefix - value: On - - key: readability-identifier-naming.ConstantHungarianPrefix - value: On - - key: readability-identifier-naming.ConstantMemberHungarianPrefix - value: On - - key: readability-identifier-naming.ConstantParameterHungarianPrefix - value: On - - key: readability-identifier-naming.ConstantPointerParameterHungarianPrefix - value: On - - key: readability-identifier-naming.ConstexprVariableHungarianPrefix - value: On - - key: readability-identifier-naming.EnumConstantHungarianPrefix - value: On - - key: readability-identifier-naming.GlobalConstantHungarianPrefix - value: On - - key: readability-identifier-naming.GlobalConstantPointerHungarianPrefix - value: On - - key: readability-identifier-naming.GlobalPointerHungarianPrefix - value: On - - key: readability-identifier-naming.GlobalVariableHungarianPrefix - value: On - - key: readability-identifier-naming.LocalConstantHungarianPrefix - value: On - - key: readability-identifier-naming.LocalConstantPointerHungarianPrefix - value: On - - key: readability-identifier-naming.LocalPointerHungarianPrefix - value: On - - key: readability-identifier-naming.LocalVariableHungarianPrefix - value: On - - key: readability-identifier-naming.MemberHungarianPrefix - value: On - - key: readability-identifier-naming.ParameterHungarianPrefix - value: On - - key: readability-identifier-naming.PointerParameterHungarianPrefix - value: On - - key: readability-identifier-naming.PrivateMemberHungarianPrefix - value: On - - key: readability-identifier-naming.ProtectedMemberHungarianPrefix - value: On - - key: readability-identifier-naming.PublicMemberHungarianPrefix - value: On - - key: readability-identifier-naming.ScopedEnumConstantHungarianPrefix - value: On - - key: readability-identifier-naming.StaticConstantHungarianPrefix - value: On - - key: readability-identifier-naming.StaticVariableHungarianPrefix - value: On - - key: readability-identifier-naming.VariableHungarianPrefix - value: On + readability-identifier-naming.AbstractClassCase: CamelCase + readability-identifier-naming.ClassCase: CamelCase + readability-identifier-naming.ClassConstantCase: CamelCase + readability-identifier-naming.ClassMemberCase: CamelCase + readability-identifier-naming.ConstantCase: CamelCase + readability-identifier-naming.ConstantMemberCase: CamelCase + readability-identifier-naming.ConstantParameterCase: CamelCase + readability-identifier-naming.ConstantPointerParameterCase: CamelCase + readability-identifier-naming.ConstexprVariableCase: CamelCase + readability-identifier-naming.EnumConstantCase: CamelCase + readability-identifier-naming.GlobalConstantCase: CamelCase + readability-identifier-naming.GlobalConstantPointerCase: CamelCase + readability-identifier-naming.GlobalPointerCase: CamelCase + readability-identifier-naming.GlobalVariableCase: CamelCase + readability-identifier-naming.LocalConstantCase: CamelCase + readability-identifier-naming.LocalConstantPointerCase: CamelCase + readability-identifier-naming.LocalPointerCase: CamelCase + readability-identifier-naming.LocalVariableCase: CamelCase + readability-identifier-naming.MemberCase: CamelCase + readability-identifier-naming.ParameterCase: CamelCase + readability-identifier-naming.PointerParameterCase: CamelCase + readability-identifier-naming.PrivateMemberCase: CamelCase + readability-identifier-naming.ProtectedMemberCase: CamelCase + readability-identifier-naming.PublicMemberCase: CamelCase + readability-identifier-naming.ScopedEnumConstantCase: CamelCase + readability-identifier-naming.StaticConstantCase: CamelCase + readability-identifier-naming.StaticVariableCase: CamelCase + readability-identifier-naming.VariableCase: CamelCase + readability-identifier-naming.AbstractClassHungarianPrefix: On + readability-identifier-naming.ClassHungarianPrefix: On + readability-identifier-naming.ClassConstantHungarianPrefix: On + readability-identifier-naming.ClassMemberHungarianPrefix: On + readability-identifier-naming.ConstantHungarianPrefix: On + readability-identifier-naming.ConstantMemberHungarianPrefix: On + readability-identifier-naming.ConstantParameterHungarianPrefix: On + readability-identifier-naming.ConstantPointerParameterHungarianPrefix: On + readability-identifier-naming.ConstexprVariableHungarianPrefix: On + readability-identifier-naming.EnumConstantHungarianPrefix: On + readability-identifier-naming.GlobalConstantHungarianPrefix: On + readability-identifier-naming.GlobalConstantPointerHungarianPrefix: On + readability-identifier-naming.GlobalPointerHungarianPrefix: On + readability-identifier-naming.GlobalVariableHungarianPrefix: On + readability-identifier-naming.LocalConstantHungarianPrefix: On + readability-identifier-naming.LocalConstantPointerHungarianPrefix: On + readability-identifier-naming.LocalPointerHungarianPrefix: On + readability-identifier-naming.LocalVariableHungarianPrefix: On + readability-identifier-naming.MemberHungarianPrefix: On + readability-identifier-naming.ParameterHungarianPrefix: On + readability-identifier-naming.PointerParameterHungarianPrefix: On + readability-identifier-naming.PrivateMemberHungarianPrefix: On + readability-identifier-naming.ProtectedMemberHungarianPrefix: On + readability-identifier-naming.PublicMemberHungarianPrefix: On + readability-identifier-naming.ScopedEnumConstantHungarianPrefix: On + readability-identifier-naming.StaticConstantHungarianPrefix: On + readability-identifier-naming.StaticVariableHungarianPrefix: On + readability-identifier-naming.VariableHungarianPrefix: On diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation2/.clang-tidy b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation2/.clang-tidy --- a/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation2/.clang-tidy +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation2/.clang-tidy @@ -1,276 +1,139 @@ Checks: readability-identifier-naming CheckOptions: - - key: readability-identifier-naming.AbstractClassCase - value: CamelCase - - key: readability-identifier-naming.ClassCase - value: CamelCase - - key: readability-identifier-naming.ClassConstantCase - value: CamelCase - - key: readability-identifier-naming.ClassMemberCase - value: CamelCase - - key: readability-identifier-naming.ConstantCase - value: CamelCase - - key: readability-identifier-naming.ConstantMemberCase - value: CamelCase - - key: readability-identifier-naming.ConstantParameterCase - value: CamelCase - - key: readability-identifier-naming.ConstantPointerParameterCase - value: CamelCase - - key: readability-identifier-naming.ConstexprVariableCase - value: CamelCase - - key: readability-identifier-naming.EnumConstantCase - value: CamelCase - - key: readability-identifier-naming.GlobalConstantCase - value: CamelCase - - key: readability-identifier-naming.GlobalConstantPointerCase - value: CamelCase - - key: readability-identifier-naming.GlobalPointerCase - value: CamelCase - - key: readability-identifier-naming.GlobalVariableCase - value: CamelCase - - key: readability-identifier-naming.LocalConstantCase - value: CamelCase - - key: readability-identifier-naming.LocalConstantPointerCase - value: CamelCase - - key: readability-identifier-naming.LocalPointerCase - value: CamelCase - - key: readability-identifier-naming.LocalVariableCase - value: CamelCase - - key: readability-identifier-naming.MemberCase - value: CamelCase - - key: readability-identifier-naming.ParameterCase - value: CamelCase - - key: readability-identifier-naming.PointerParameterCase - value: CamelCase - - key: readability-identifier-naming.PrivateMemberCase - value: CamelCase - - key: readability-identifier-naming.ProtectedMemberCase - value: CamelCase - - key: readability-identifier-naming.PublicMemberCase - value: CamelCase - - key: readability-identifier-naming.ScopedEnumConstantCase - value: CamelCase - - key: readability-identifier-naming.StaticConstantCase - value: CamelCase - - key: readability-identifier-naming.StaticVariableCase - value: CamelCase - - key: readability-identifier-naming.VariableCase - value: CamelCase - - key: readability-identifier-naming.AbstractClassHungarianPrefix - value: On - - key: readability-identifier-naming.ClassHungarianPrefix - value: On - - key: readability-identifier-naming.ClassConstantHungarianPrefix - value: On - - key: readability-identifier-naming.ClassMemberHungarianPrefix - value: On - - key: readability-identifier-naming.ConstantHungarianPrefix - value: On - - key: readability-identifier-naming.ConstantMemberHungarianPrefix - value: On - - key: readability-identifier-naming.ConstantParameterHungarianPrefix - value: On - - key: readability-identifier-naming.ConstantPointerParameterHungarianPrefix - value: On - - key: readability-identifier-naming.ConstexprVariableHungarianPrefix - value: On - - key: readability-identifier-naming.EnumConstantHungarianPrefix - value: On - - key: readability-identifier-naming.GlobalConstantHungarianPrefix - value: On - - key: readability-identifier-naming.GlobalConstantPointerHungarianPrefix - value: On - - key: readability-identifier-naming.GlobalPointerHungarianPrefix - value: On - - key: readability-identifier-naming.GlobalVariableHungarianPrefix - value: On - - key: readability-identifier-naming.LocalConstantHungarianPrefix - value: On - - key: readability-identifier-naming.LocalConstantPointerHungarianPrefix - value: On - - key: readability-identifier-naming.LocalPointerHungarianPrefix - value: On - - key: readability-identifier-naming.LocalVariableHungarianPrefix - value: On - - key: readability-identifier-naming.MemberHungarianPrefix - value: On - - key: readability-identifier-naming.ParameterHungarianPrefix - value: On - - key: readability-identifier-naming.PointerParameterHungarianPrefix - value: On - - key: readability-identifier-naming.PrivateMemberHungarianPrefix - value: On - - key: readability-identifier-naming.ProtectedMemberHungarianPrefix - value: On - - key: readability-identifier-naming.PublicMemberHungarianPrefix - value: On - - key: readability-identifier-naming.ScopedEnumConstantHungarianPrefix - value: On - - key: readability-identifier-naming.StaticConstantHungarianPrefix - value: On - - key: readability-identifier-naming.StaticVariableHungarianPrefix - value: On - - key: readability-identifier-naming.VariableHungarianPrefix - value: On - - key: readability-identifier-naming.HungarianNotation.General.TreatStructAsClass - value: true - - key: readability-identifier-naming.HungarianNotation.DerivedType.Array - value: mya - - key: readability-identifier-naming.HungarianNotation.DerivedType.Pointer - value: myp - - key: readability-identifier-naming.HungarianNotation.DerivedType.FunctionPointer - value: myfn - - key: readability-identifier-naming.HungarianNotation.CString.CharPointer - value: mysz - - key: readability-identifier-naming.HungarianNotation.CString.CharArray - value: mysz - - key: readability-identifier-naming.HungarianNotation.CString.WideCharPointer - value: mywsz - - key: readability-identifier-naming.HungarianNotation.CString.WideCharArray - value: mywsz - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.int8_t - value: myi8 - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.int16_t - value: myi16 - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.int32_t - value: myi32 - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.int64_t - value: myi64 - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.uint8_t - value: myu8 - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.uint16_t - value: myu16 - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.uint32_t - value: myu32 - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.uint64_t - value: myu64 - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.char8_t - value: myc8 - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.char16_t - value: myc16 - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.char32_t - value: myc32 - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.float - value: myf - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.double - value: myd - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.char - value: myc - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.bool - value: myb - - key: readability-identifier-naming.HungarianNotation.PrimitiveType._Bool - value: myb - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.int - value: myi - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.size_t - value: myn - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.wchar_t - value: mywc - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.short-int - value: mysi - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.short - value: mys - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.signed-int - value: mysi - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.signed-short - value: myss - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.signed-short-int - value: myssi - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.signed-long-long-int - value: myslli - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.signed-long-long - value: mysll - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.signed-long-int - value: mysli - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.signed-long - value: mysl - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.signed - value: mys - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-long-long-int - value: myulli - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-long-long - value: myull - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-long-int - value: myuli - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-long - value: myul - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-short-int - value: myusi - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-short - value: myus - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-int - value: myui - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-char - value: myuc - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned - value: myu - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.long-long-int - value: mylli - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.long-double - value: myld - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.long-long - value: myll - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.long-int - value: myli - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.long - value: myl - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.ptrdiff_t - value: myp - - key: readability-identifier-naming.HungarianNotation.PrimitiveType.void - value: myv - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.BOOL - value: myb - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.BOOLEAN - value: myb - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.BYTE - value: myby - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.CHAR - value: myc - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.UCHAR - value: myuc - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.SHORT - value: mys - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.USHORT - value: myus - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.WORD - value: myw - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.DWORD - value: mydw - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.DWORD32 - value: mydw32 - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.DWORD64 - value: mydw64 - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.LONG - value: myl - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.ULONG - value: myul - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.ULONG32 - value: myul32 - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.ULONG64 - value: myul64 - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.ULONGLONG - value: myull - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.HANDLE - value: myh - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.INT - value: myi - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.INT8 - value: myi8 - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.INT16 - value: myi16 - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.INT32 - value: myi32 - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.INT64 - value: myi64 - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.UINT - value: myui - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.UINT8 - value: myu8 - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.UINT16 - value: myu16 - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.UINT32 - value: myu32 - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.UINT64 - value: myu64 - - key: readability-identifier-naming.HungarianNotation.UserDefinedType.PVOID - value: myp + readability-identifier-naming.AbstractClassCase: CamelCase + readability-identifier-naming.ClassCase: CamelCase + readability-identifier-naming.ClassConstantCase: CamelCase + readability-identifier-naming.ClassMemberCase: CamelCase + readability-identifier-naming.ConstantCase: CamelCase + readability-identifier-naming.ConstantMemberCase: CamelCase + readability-identifier-naming.ConstantParameterCase: CamelCase + readability-identifier-naming.ConstantPointerParameterCase: CamelCase + readability-identifier-naming.ConstexprVariableCase: CamelCase + readability-identifier-naming.EnumConstantCase: CamelCase + readability-identifier-naming.GlobalConstantCase: CamelCase + readability-identifier-naming.GlobalConstantPointerCase: CamelCase + readability-identifier-naming.GlobalPointerCase: CamelCase + readability-identifier-naming.GlobalVariableCase: CamelCase + readability-identifier-naming.LocalConstantCase: CamelCase + readability-identifier-naming.LocalConstantPointerCase: CamelCase + readability-identifier-naming.LocalPointerCase: CamelCase + readability-identifier-naming.LocalVariableCase: CamelCase + readability-identifier-naming.MemberCase: CamelCase + readability-identifier-naming.ParameterCase: CamelCase + readability-identifier-naming.PointerParameterCase: CamelCase + readability-identifier-naming.PrivateMemberCase: CamelCase + readability-identifier-naming.ProtectedMemberCase: CamelCase + readability-identifier-naming.PublicMemberCase: CamelCase + readability-identifier-naming.ScopedEnumConstantCase: CamelCase + readability-identifier-naming.StaticConstantCase: CamelCase + readability-identifier-naming.StaticVariableCase: CamelCase + readability-identifier-naming.VariableCase: CamelCase + readability-identifier-naming.AbstractClassHungarianPrefix: On + readability-identifier-naming.ClassHungarianPrefix: On + readability-identifier-naming.ClassConstantHungarianPrefix: On + readability-identifier-naming.ClassMemberHungarianPrefix: On + readability-identifier-naming.ConstantHungarianPrefix: On + readability-identifier-naming.ConstantMemberHungarianPrefix: On + readability-identifier-naming.ConstantParameterHungarianPrefix: On + readability-identifier-naming.ConstantPointerParameterHungarianPrefix: On + readability-identifier-naming.ConstexprVariableHungarianPrefix: On + readability-identifier-naming.EnumConstantHungarianPrefix: On + readability-identifier-naming.GlobalConstantHungarianPrefix: On + readability-identifier-naming.GlobalConstantPointerHungarianPrefix: On + readability-identifier-naming.GlobalPointerHungarianPrefix: On + readability-identifier-naming.GlobalVariableHungarianPrefix: On + readability-identifier-naming.LocalConstantHungarianPrefix: On + readability-identifier-naming.LocalConstantPointerHungarianPrefix: On + readability-identifier-naming.LocalPointerHungarianPrefix: On + readability-identifier-naming.LocalVariableHungarianPrefix: On + readability-identifier-naming.MemberHungarianPrefix: On + readability-identifier-naming.ParameterHungarianPrefix: On + readability-identifier-naming.PointerParameterHungarianPrefix: On + readability-identifier-naming.PrivateMemberHungarianPrefix: On + readability-identifier-naming.ProtectedMemberHungarianPrefix: On + readability-identifier-naming.PublicMemberHungarianPrefix: On + readability-identifier-naming.ScopedEnumConstantHungarianPrefix: On + readability-identifier-naming.StaticConstantHungarianPrefix: On + readability-identifier-naming.StaticVariableHungarianPrefix: On + readability-identifier-naming.VariableHungarianPrefix: On + readability-identifier-naming.HungarianNotation.General.TreatStructAsClass: true + readability-identifier-naming.HungarianNotation.DerivedType.Array: mya + readability-identifier-naming.HungarianNotation.DerivedType.Pointer: myp + readability-identifier-naming.HungarianNotation.DerivedType.FunctionPointer: myfn + readability-identifier-naming.HungarianNotation.CString.CharPointer: mysz + readability-identifier-naming.HungarianNotation.CString.CharArray: mysz + readability-identifier-naming.HungarianNotation.CString.WideCharPointer: mywsz + readability-identifier-naming.HungarianNotation.CString.WideCharArray: mywsz + readability-identifier-naming.HungarianNotation.PrimitiveType.int8_t: myi8 + readability-identifier-naming.HungarianNotation.PrimitiveType.int16_t: myi16 + readability-identifier-naming.HungarianNotation.PrimitiveType.int32_t: myi32 + readability-identifier-naming.HungarianNotation.PrimitiveType.int64_t: myi64 + readability-identifier-naming.HungarianNotation.PrimitiveType.uint8_t: myu8 + readability-identifier-naming.HungarianNotation.PrimitiveType.uint16_t: myu16 + readability-identifier-naming.HungarianNotation.PrimitiveType.uint32_t: myu32 + readability-identifier-naming.HungarianNotation.PrimitiveType.uint64_t: myu64 + readability-identifier-naming.HungarianNotation.PrimitiveType.char8_t: myc8 + readability-identifier-naming.HungarianNotation.PrimitiveType.char16_t: myc16 + readability-identifier-naming.HungarianNotation.PrimitiveType.char32_t: myc32 + readability-identifier-naming.HungarianNotation.PrimitiveType.float: myf + readability-identifier-naming.HungarianNotation.PrimitiveType.double: myd + readability-identifier-naming.HungarianNotation.PrimitiveType.char: myc + readability-identifier-naming.HungarianNotation.PrimitiveType.bool: myb + readability-identifier-naming.HungarianNotation.PrimitiveType._Bool: myb + readability-identifier-naming.HungarianNotation.PrimitiveType.int: myi + readability-identifier-naming.HungarianNotation.PrimitiveType.size_t: myn + readability-identifier-naming.HungarianNotation.PrimitiveType.wchar_t: mywc + readability-identifier-naming.HungarianNotation.PrimitiveType.short-int: mysi + readability-identifier-naming.HungarianNotation.PrimitiveType.short: mys + readability-identifier-naming.HungarianNotation.PrimitiveType.signed-int: mysi + readability-identifier-naming.HungarianNotation.PrimitiveType.signed-short: myss + readability-identifier-naming.HungarianNotation.PrimitiveType.signed-short-int: myssi + readability-identifier-naming.HungarianNotation.PrimitiveType.signed-long-long-int: myslli + readability-identifier-naming.HungarianNotation.PrimitiveType.signed-long-long: mysll + readability-identifier-naming.HungarianNotation.PrimitiveType.signed-long-int: mysli + readability-identifier-naming.HungarianNotation.PrimitiveType.signed-long: mysl + readability-identifier-naming.HungarianNotation.PrimitiveType.signed: mys + readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-long-long-int: myulli + readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-long-long: myull + readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-long-int: myuli + readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-long: myul + readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-short-int: myusi + readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-short: myus + readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-int: myui + readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned-char: myuc + readability-identifier-naming.HungarianNotation.PrimitiveType.unsigned: myu + readability-identifier-naming.HungarianNotation.PrimitiveType.long-long-int: mylli + readability-identifier-naming.HungarianNotation.PrimitiveType.long-double: myld + readability-identifier-naming.HungarianNotation.PrimitiveType.long-long: myll + readability-identifier-naming.HungarianNotation.PrimitiveType.long-int: myli + readability-identifier-naming.HungarianNotation.PrimitiveType.long: myl + readability-identifier-naming.HungarianNotation.PrimitiveType.ptrdiff_t: myp + readability-identifier-naming.HungarianNotation.PrimitiveType.void: myv + readability-identifier-naming.HungarianNotation.UserDefinedType.BOOL: myb + readability-identifier-naming.HungarianNotation.UserDefinedType.BOOLEAN: myb + readability-identifier-naming.HungarianNotation.UserDefinedType.BYTE: myby + readability-identifier-naming.HungarianNotation.UserDefinedType.CHAR: myc + readability-identifier-naming.HungarianNotation.UserDefinedType.UCHAR: myuc + readability-identifier-naming.HungarianNotation.UserDefinedType.SHORT: mys + readability-identifier-naming.HungarianNotation.UserDefinedType.USHORT: myus + readability-identifier-naming.HungarianNotation.UserDefinedType.WORD: myw + readability-identifier-naming.HungarianNotation.UserDefinedType.DWORD: mydw + readability-identifier-naming.HungarianNotation.UserDefinedType.DWORD32: mydw32 + readability-identifier-naming.HungarianNotation.UserDefinedType.DWORD64: mydw64 + readability-identifier-naming.HungarianNotation.UserDefinedType.LONG: myl + readability-identifier-naming.HungarianNotation.UserDefinedType.ULONG: myul + readability-identifier-naming.HungarianNotation.UserDefinedType.ULONG32: myul32 + readability-identifier-naming.HungarianNotation.UserDefinedType.ULONG64: myul64 + readability-identifier-naming.HungarianNotation.UserDefinedType.ULONGLONG: myull + readability-identifier-naming.HungarianNotation.UserDefinedType.HANDLE: myh + readability-identifier-naming.HungarianNotation.UserDefinedType.INT: myi + readability-identifier-naming.HungarianNotation.UserDefinedType.INT8: myi8 + readability-identifier-naming.HungarianNotation.UserDefinedType.INT16: myi16 + readability-identifier-naming.HungarianNotation.UserDefinedType.INT32: myi32 + readability-identifier-naming.HungarianNotation.UserDefinedType.INT64: myi64 + readability-identifier-naming.HungarianNotation.UserDefinedType.UINT: myui + readability-identifier-naming.HungarianNotation.UserDefinedType.UINT8: myu8 + readability-identifier-naming.HungarianNotation.UserDefinedType.UINT16: myu16 + readability-identifier-naming.HungarianNotation.UserDefinedType.UINT32: myu32 + readability-identifier-naming.HungarianNotation.UserDefinedType.UINT64: myu64 + readability-identifier-naming.HungarianNotation.UserDefinedType.PVOID: myp diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-few-lines.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-few-lines.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-few-lines.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-few-lines.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s readability-braces-around-statements %t -- -config="{CheckOptions: [{key: readability-braces-around-statements.ShortStatementLines, value: 4}]}" -- +// RUN: %check_clang_tidy %s readability-braces-around-statements %t -- -config="{CheckOptions: {readability-braces-around-statements.ShortStatementLines: 4}}" -- void do_something(const char *) {} diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-same-line.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-same-line.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-same-line.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-same-line.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s readability-braces-around-statements %t -- -config="{CheckOptions: [{key: readability-braces-around-statements.ShortStatementLines, value: 1}]}" -- +// RUN: %check_clang_tidy %s readability-braces-around-statements %t -- -config="{CheckOptions: {readability-braces-around-statements.ShortStatementLines: 1}}" -- void do_something(const char *) {} diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-single-line.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-single-line.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-single-line.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-single-line.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s readability-braces-around-statements %t -- -config="{CheckOptions: [{key: readability-braces-around-statements.ShortStatementLines, value: 2}]}" -- +// RUN: %check_clang_tidy %s readability-braces-around-statements %t -- -config="{CheckOptions: {readability-braces-around-statements.ShortStatementLines: 2}}" -- void do_something(const char *) {} diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-cond-var-refactor.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-cond-var-refactor.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-cond-var-refactor.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-cond-var-refactor.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s readability-else-after-return %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: readability-else-after-return.WarnOnConditionVariables, value: false}, \ -// RUN: ]}' +// RUN: -config='{CheckOptions: { \ +// RUN: readability-else-after-return.WarnOnConditionVariables: false, \ +// RUN: }}' bool foo(int Y) { // Excess scopes are here so that the check would have to opportunity to diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-warn.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-warn.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-warn.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-warn.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s readability-else-after-return %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: readability-else-after-return.WarnOnUnfixable, value: false}, \ -// RUN: ]}' +// RUN: -config='{CheckOptions: { \ +// RUN: readability-else-after-return.WarnOnUnfixable: false, \ +// RUN: }}' int h(int); diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity-flags.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity-flags.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity-flags.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity-flags.cpp @@ -1,31 +1,21 @@ // RUN: %check_clang_tidy %s readability-function-cognitive-complexity %t -- \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: readability-function-cognitive-complexity.Threshold, \ -// RUN: value: 0}, \ -// RUN: {key: readability-function-cognitive-complexity.DescribeBasicIncrements, \ -// RUN: value: "false"} ]}' +// RUN: {readability-function-cognitive-complexity.Threshold: 0, \ +// RUN: readability-function-cognitive-complexity.DescribeBasicIncrements: "false"}}' // RUN: %check_clang_tidy -check-suffix=THRESHOLD5 %s readability-function-cognitive-complexity %t -- \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: readability-function-cognitive-complexity.Threshold, \ -// RUN: value: 5}, \ -// RUN: {key: readability-function-cognitive-complexity.DescribeBasicIncrements, \ -// RUN: value: "false"} ]}' +// RUN: {readability-function-cognitive-complexity.Threshold: 5, \ +// RUN: readability-function-cognitive-complexity.DescribeBasicIncrements: "false"}}' // RUN: %check_clang_tidy -check-suffix=IGNORE-MACROS %s readability-function-cognitive-complexity %t -- \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: readability-function-cognitive-complexity.Threshold, \ -// RUN: value: 0}, \ -// RUN: {key: readability-function-cognitive-complexity.IgnoreMacros, \ -// RUN: value: "true"}, \ -// RUN: {key: readability-function-cognitive-complexity.DescribeBasicIncrements, \ -// RUN: value: "false"} ]}' +// RUN: {readability-function-cognitive-complexity.Threshold: 0, \ +// RUN: readability-function-cognitive-complexity.IgnoreMacros: "true", \ +// RUN: readability-function-cognitive-complexity.DescribeBasicIncrements: "false"}}' // RUN: %check_clang_tidy -check-suffix=GLOBAL-IGNORE-MACROS %s readability-function-cognitive-complexity %t -- \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: readability-function-cognitive-complexity.Threshold, \ -// RUN: value: 0}, \ -// RUN: {key: IgnoreMacros, \ -// RUN: value: "true"}, \ -// RUN: {key: readability-function-cognitive-complexity.DescribeBasicIncrements, \ -// RUN: value: "false"} ]}' +// RUN: {readability-function-cognitive-complexity.Threshold: 0, \ +// RUN: IgnoreMacros: "true", \ +// RUN: readability-function-cognitive-complexity.DescribeBasicIncrements: "false"}}' void func_of_complexity_4() { // CHECK-NOTES: :[[@LINE-1]]:6: warning: function 'func_of_complexity_4' has cognitive complexity of 4 (threshold 0) [readability-function-cognitive-complexity] diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s readability-function-cognitive-complexity %t -- -config='{CheckOptions: [{key: readability-function-cognitive-complexity.Threshold, value: 0}]}' -- -std=c++11 -fblocks -fexceptions -w +// RUN: %check_clang_tidy %s readability-function-cognitive-complexity %t -- -config='{CheckOptions: {readability-function-cognitive-complexity.Threshold: 0}}' -- -std=c++11 -fblocks -fexceptions -w // any function should be checked. diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/function-size-variables-c++17.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/function-size-variables-c++17.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/function-size-variables-c++17.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/function-size-variables-c++17.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s readability-function-size %t -- -config='{CheckOptions: [{key: readability-function-size.LineThreshold, value: 0}, {key: readability-function-size.StatementThreshold, value: 0}, {key: readability-function-size.BranchThreshold, value: 0}, {key: readability-function-size.ParameterThreshold, value: 5}, {key: readability-function-size.NestingThreshold, value: 2}, {key: readability-function-size.VariableThreshold, value: 1}]}' -- -std=c++17 +// RUN: %check_clang_tidy %s readability-function-size %t -- -config='{CheckOptions: {readability-function-size.LineThreshold: 0, readability-function-size.StatementThreshold: 0, readability-function-size.BranchThreshold: 0, readability-function-size.ParameterThreshold: 5, readability-function-size.NestingThreshold: 2, readability-function-size.VariableThreshold: 1}}' -- -std=c++17 void structured_bindings() { int a[2] = {1, 2}; diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/function-size.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/function-size.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/function-size.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/function-size.cpp @@ -1,12 +1,12 @@ // RUN: %check_clang_tidy %s readability-function-size %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: readability-function-size.LineThreshold, value: 0}, \ -// RUN: {key: readability-function-size.StatementThreshold, value: 0}, \ -// RUN: {key: readability-function-size.BranchThreshold, value: 0}, \ -// RUN: {key: readability-function-size.ParameterThreshold, value: 5}, \ -// RUN: {key: readability-function-size.NestingThreshold, value: 2}, \ -// RUN: {key: readability-function-size.VariableThreshold, value: 1} \ -// RUN: ]}' +// RUN: -config='{CheckOptions: { \ +// RUN: readability-function-size.LineThreshold: 0, \ +// RUN: readability-function-size.StatementThreshold: 0, \ +// RUN: readability-function-size.BranchThreshold: 0, \ +// RUN: readability-function-size.ParameterThreshold: 5, \ +// RUN: readability-function-size.NestingThreshold: 2, \ +// RUN: readability-function-size.VariableThreshold: 1 \ +// RUN: }}' // Bad formatting is intentional, don't run clang-format over the whole file! diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-length.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-length.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-length.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-length.cpp @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s readability-identifier-length %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: readability-identifier-length.IgnoredVariableNames, value: "^[xy]$"}]}' \ +// RUN: {readability-identifier-length.IgnoredVariableNames: "^[xy]$"}}' \ // RUN: -- -fexceptions struct myexcept { diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-bugfix-name-conflicts.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-bugfix-name-conflicts.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-bugfix-name-conflicts.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-bugfix-name-conflicts.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s readability-identifier-naming %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: readability-identifier-naming.ParameterCase, value: lower_case} \ -// RUN: ]}' +// RUN: -config='{CheckOptions: { \ +// RUN: readability-identifier-naming.ParameterCase: lower_case \ +// RUN: }}' int func(int Break) { // CHECK-MESSAGES: :[[@LINE-1]]:14: warning: invalid case style for parameter 'Break'; cannot be fixed because 'break' would conflict with a keyword diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-case-violation.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-case-violation.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-case-violation.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-case-violation.cpp @@ -1,11 +1,11 @@ // RUN: clang-tidy %s -checks=readability-identifier-naming \ -// RUN: -config="{CheckOptions: [\ -// RUN: {key: readability-identifier-naming.FunctionCase, value: camelback}, \ -// RUN: {key: readability-identifier-naming.VariableCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.ClassCase, value: UUPER_CASE}, \ -// RUN: {key: readability-identifier-naming.StructCase, value: CAMEL}, \ -// RUN: {key: readability-identifier-naming.EnumCase, value: AnY_cASe}, \ -// RUN: ]}" 2>&1 | FileCheck %s --implicit-check-not="{{warning|error}}:" +// RUN: -config="{CheckOptions: {\ +// RUN: readability-identifier-naming.FunctionCase: camelback, \ +// RUN: readability-identifier-naming.VariableCase: camelBack, \ +// RUN: readability-identifier-naming.ClassCase: UUPER_CASE, \ +// RUN: readability-identifier-naming.StructCase: CAMEL, \ +// RUN: readability-identifier-naming.EnumCase: AnY_cASe, \ +// RUN: }}" 2>&1 | FileCheck %s --implicit-check-not="{{warning|error}}:" // CHECK-DAG: warning: invalid configuration value 'camelback' for option 'readability-identifier-naming.FunctionCase'; did you mean 'camelBack'? [clang-tidy-config] // CHECK-DAG: warning: invalid configuration value 'UUPER_CASE' for option 'readability-identifier-naming.ClassCase'; did you mean 'UPPER_CASE'? [clang-tidy-config] diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-ignored-regexp.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-ignored-regexp.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-ignored-regexp.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-ignored-regexp.cpp @@ -1,12 +1,12 @@ // RUN: %check_clang_tidy %s readability-identifier-naming %t -- \ -// RUN: -config="{CheckOptions: [ \ -// RUN: {key: readability-identifier-naming.ParameterCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.ParameterIgnoredRegexp, value: '^[a-z]{1,2}$'}, \ -// RUN: {key: readability-identifier-naming.ClassCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.ClassIgnoredRegexp, value: '^fo$|^fooo$'}, \ -// RUN: {key: readability-identifier-naming.StructCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.StructIgnoredRegexp, value: 'sooo|so|soo|$invalidregex['} \ -// RUN: ]}" +// RUN: -config="{CheckOptions: { \ +// RUN: readability-identifier-naming.ParameterCase: CamelCase, \ +// RUN: readability-identifier-naming.ParameterIgnoredRegexp: '^[a-z]{1,2}$', \ +// RUN: readability-identifier-naming.ClassCase: CamelCase, \ +// RUN: readability-identifier-naming.ClassIgnoredRegexp: '^fo$|^fooo$', \ +// RUN: readability-identifier-naming.StructCase: CamelCase, \ +// RUN: readability-identifier-naming.StructIgnoredRegexp: 'sooo|so|soo|$invalidregex[' \ +// RUN: }}" int testFunc(int a, char **b); int testFunc(int ab, char **ba); diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-main-like.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-main-like.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-main-like.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-main-like.cpp @@ -1,8 +1,8 @@ // RUN: %check_clang_tidy %s readability-identifier-naming %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: readability-identifier-naming.ParameterCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.IgnoreMainLikeFunctions, value: true} \ -// RUN: ]}' +// RUN: -config='{CheckOptions: { \ +// RUN: readability-identifier-naming.ParameterCase: CamelCase, \ +// RUN: readability-identifier-naming.IgnoreMainLikeFunctions: true \ +// RUN: }}' int mainLike(int argc, char **argv); int mainLike(int argc, char **argv, const char **env); diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-member-decl-usage.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-member-decl-usage.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-member-decl-usage.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-member-decl-usage.cpp @@ -1,10 +1,10 @@ // RUN: %check_clang_tidy %s readability-identifier-naming %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: readability-identifier-naming.MemberCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.ParameterCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.MethodCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.AggressiveDependentMemberLookup, value: true} \ -// RUN: ]}' -- -fno-delayed-template-parsing +// RUN: -config='{CheckOptions: { \ +// RUN: readability-identifier-naming.MemberCase: CamelCase, \ +// RUN: readability-identifier-naming.ParameterCase: CamelCase, \ +// RUN: readability-identifier-naming.MethodCase: camelBack, \ +// RUN: readability-identifier-naming.AggressiveDependentMemberLookup: true \ +// RUN: }}' -- -fno-delayed-template-parsing int set_up(int); int clear(int); diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-multiple-styles.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-multiple-styles.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-multiple-styles.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-multiple-styles.cpp @@ -11,22 +11,22 @@ // RUN: %check_clang_tidy -check-suffixes=ENABLED,SHARED -std=c++11 %s \ // RUN: readability-identifier-naming %t -- \ -// RUN: -config='{ InheritParentConfig: true, CheckOptions: [ \ -// RUN: {key: readability-identifier-naming.FunctionCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.ParameterCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.GetConfigPerFile, value: true} \ -// RUN: ]}' -header-filter='.*' -- -I%theaders +// RUN: -config='{ InheritParentConfig: true, CheckOptions: { \ +// RUN: readability-identifier-naming.FunctionCase: camelBack, \ +// RUN: readability-identifier-naming.ParameterCase: CamelCase, \ +// RUN: readability-identifier-naming.GetConfigPerFile: true \ +// RUN: }}' -header-filter='.*' -- -I%theaders // On DISABLED run, everything should be made 'camelBack'. // RUN: cp -R %S/Inputs/identifier-naming/. %theaders // RUN: %check_clang_tidy -check-suffixes=DISABLED,SHARED -std=c++11 %s \ // RUN: readability-identifier-naming %t -- \ -// RUN: -config='{ InheritParentConfig: false, CheckOptions: [ \ -// RUN: {key: readability-identifier-naming.FunctionCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.ParameterCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.GetConfigPerFile, value: false} \ -// RUN: ]}' -header-filter='.*' -- -I%theaders +// RUN: -config='{ InheritParentConfig: false, CheckOptions: { \ +// RUN: readability-identifier-naming.FunctionCase: camelBack, \ +// RUN: readability-identifier-naming.ParameterCase: CamelCase, \ +// RUN: readability-identifier-naming.GetConfigPerFile: false \ +// RUN: }}' -header-filter='.*' -- -I%theaders #include "global-style1/header.h" #include "global-style2/header.h" diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-objc.m b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-objc.m --- a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-objc.m +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-objc.m @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s readability-identifier-naming %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: readability-identifier-naming.ObjcIvarPrefix, value: '_'}]}' \ +// RUN: {readability-identifier-naming.ObjcIvarPrefix: '_'}}' \ // RUN: -- @interface Foo { diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming.cpp @@ -2,86 +2,86 @@ // r288563 is resolved. // UNSUPPORTED: target=powerpc64le{{.*}} // RUN: %check_clang_tidy -std=c++20 %s readability-identifier-naming %t -- \ -// RUN: -config='{CheckOptions: [ \ -// RUN: {key: readability-identifier-naming.AbstractClassCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.AbstractClassPrefix, value: 'A'}, \ -// RUN: {key: readability-identifier-naming.ClassCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.ClassPrefix, value: 'C'}, \ -// RUN: {key: readability-identifier-naming.ClassConstantCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.ClassConstantPrefix, value: 'k'}, \ -// RUN: {key: readability-identifier-naming.ClassMemberCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.ClassMethodCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.ConstantCase, value: UPPER_CASE}, \ -// RUN: {key: readability-identifier-naming.ConstantSuffix, value: '_CST'}, \ -// RUN: {key: readability-identifier-naming.ConstexprFunctionCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.ConstexprMethodCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.ConstexprVariableCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.EnumCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.EnumPrefix, value: 'E'}, \ -// RUN: {key: readability-identifier-naming.ScopedEnumConstantCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.EnumConstantCase, value: UPPER_CASE}, \ -// RUN: {key: readability-identifier-naming.FunctionCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.GlobalConstantCase, value: UPPER_CASE}, \ -// RUN: {key: readability-identifier-naming.GlobalFunctionCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.GlobalVariableCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.GlobalVariablePrefix, value: 'g_'}, \ -// RUN: {key: readability-identifier-naming.InlineNamespaceCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.LocalConstantCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.LocalConstantPrefix, value: 'k'}, \ -// RUN: {key: readability-identifier-naming.LocalVariableCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.MemberCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.MemberPrefix, value: 'm_'}, \ -// RUN: {key: readability-identifier-naming.ConstantMemberCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.PrivateMemberPrefix, value: '__'}, \ -// RUN: {key: readability-identifier-naming.ProtectedMemberPrefix, value: '_'}, \ -// RUN: {key: readability-identifier-naming.PublicMemberCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.MethodCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.PrivateMethodPrefix, value: '__'}, \ -// RUN: {key: readability-identifier-naming.ProtectedMethodPrefix, value: '_'}, \ -// RUN: {key: readability-identifier-naming.NamespaceCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.ParameterCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.ParameterPrefix, value: 'a_'}, \ -// RUN: {key: readability-identifier-naming.ConstantParameterCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.ConstantParameterPrefix, value: 'i_'}, \ -// RUN: {key: readability-identifier-naming.ParameterPackCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.PureFunctionCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.PureMethodCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.StaticConstantCase, value: UPPER_CASE}, \ -// RUN: {key: readability-identifier-naming.StaticVariableCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.StaticVariablePrefix, value: 's_'}, \ -// RUN: {key: readability-identifier-naming.StructCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.TemplateParameterCase, value: UPPER_CASE}, \ -// RUN: {key: readability-identifier-naming.TemplateTemplateParameterCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.TemplateUsingCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.TemplateUsingPrefix, value: 'u_'}, \ -// RUN: {key: readability-identifier-naming.TypeTemplateParameterCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.TypeTemplateParameterSuffix, value: '_t'}, \ -// RUN: {key: readability-identifier-naming.TypedefCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.TypedefSuffix, value: '_t'}, \ -// RUN: {key: readability-identifier-naming.UnionCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.UnionPrefix, value: 'U'}, \ -// RUN: {key: readability-identifier-naming.UsingCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.ValueTemplateParameterCase, value: camelBack}, \ -// RUN: {key: readability-identifier-naming.VariableCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.VirtualMethodCase, value: Camel_Snake_Case}, \ -// RUN: {key: readability-identifier-naming.VirtualMethodPrefix, value: 'v_'}, \ -// RUN: {key: readability-identifier-naming.MacroDefinitionCase, value: UPPER_CASE}, \ -// RUN: {key: readability-identifier-naming.TypeAliasCase, value: camel_Snake_Back}, \ -// RUN: {key: readability-identifier-naming.TypeAliasSuffix, value: '_t'}, \ -// RUN: {key: readability-identifier-naming.IgnoreFailedSplit, value: false}, \ -// RUN: {key: readability-identifier-naming.GlobalPointerCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.GlobalPointerSuffix, value: '_Ptr'}, \ -// RUN: {key: readability-identifier-naming.GlobalConstantPointerCase, value: UPPER_CASE}, \ -// RUN: {key: readability-identifier-naming.GlobalConstantPointerSuffix, value: '_Ptr'}, \ -// RUN: {key: readability-identifier-naming.PointerParameterCase, value: lower_case}, \ -// RUN: {key: readability-identifier-naming.PointerParameterPrefix, value: 'p_'}, \ -// RUN: {key: readability-identifier-naming.ConstantPointerParameterCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.ConstantPointerParameterPrefix, value: 'cp_'}, \ -// RUN: {key: readability-identifier-naming.LocalPointerCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.LocalPointerPrefix, value: 'l_'}, \ -// RUN: {key: readability-identifier-naming.LocalConstantPointerCase, value: CamelCase}, \ -// RUN: {key: readability-identifier-naming.LocalConstantPointerPrefix, value: 'lc_'}, \ -// RUN: ]}' -- -fno-delayed-template-parsing -Dbad_macro \ +// RUN: -config='{CheckOptions: { \ +// RUN: readability-identifier-naming.AbstractClassCase: CamelCase, \ +// RUN: readability-identifier-naming.AbstractClassPrefix: 'A', \ +// RUN: readability-identifier-naming.ClassCase: CamelCase, \ +// RUN: readability-identifier-naming.ClassPrefix: 'C', \ +// RUN: readability-identifier-naming.ClassConstantCase: CamelCase, \ +// RUN: readability-identifier-naming.ClassConstantPrefix: 'k', \ +// RUN: readability-identifier-naming.ClassMemberCase: CamelCase, \ +// RUN: readability-identifier-naming.ClassMethodCase: camelBack, \ +// RUN: readability-identifier-naming.ConstantCase: UPPER_CASE, \ +// RUN: readability-identifier-naming.ConstantSuffix: '_CST', \ +// RUN: readability-identifier-naming.ConstexprFunctionCase: lower_case, \ +// RUN: readability-identifier-naming.ConstexprMethodCase: lower_case, \ +// RUN: readability-identifier-naming.ConstexprVariableCase: lower_case, \ +// RUN: readability-identifier-naming.EnumCase: CamelCase, \ +// RUN: readability-identifier-naming.EnumPrefix: 'E', \ +// RUN: readability-identifier-naming.ScopedEnumConstantCase: CamelCase, \ +// RUN: readability-identifier-naming.EnumConstantCase: UPPER_CASE, \ +// RUN: readability-identifier-naming.FunctionCase: camelBack, \ +// RUN: readability-identifier-naming.GlobalConstantCase: UPPER_CASE, \ +// RUN: readability-identifier-naming.GlobalFunctionCase: CamelCase, \ +// RUN: readability-identifier-naming.GlobalVariableCase: lower_case, \ +// RUN: readability-identifier-naming.GlobalVariablePrefix: 'g_', \ +// RUN: readability-identifier-naming.InlineNamespaceCase: lower_case, \ +// RUN: readability-identifier-naming.LocalConstantCase: CamelCase, \ +// RUN: readability-identifier-naming.LocalConstantPrefix: 'k', \ +// RUN: readability-identifier-naming.LocalVariableCase: lower_case, \ +// RUN: readability-identifier-naming.MemberCase: CamelCase, \ +// RUN: readability-identifier-naming.MemberPrefix: 'm_', \ +// RUN: readability-identifier-naming.ConstantMemberCase: lower_case, \ +// RUN: readability-identifier-naming.PrivateMemberPrefix: '__', \ +// RUN: readability-identifier-naming.ProtectedMemberPrefix: '_', \ +// RUN: readability-identifier-naming.PublicMemberCase: lower_case, \ +// RUN: readability-identifier-naming.MethodCase: camelBack, \ +// RUN: readability-identifier-naming.PrivateMethodPrefix: '__', \ +// RUN: readability-identifier-naming.ProtectedMethodPrefix: '_', \ +// RUN: readability-identifier-naming.NamespaceCase: lower_case, \ +// RUN: readability-identifier-naming.ParameterCase: camelBack, \ +// RUN: readability-identifier-naming.ParameterPrefix: 'a_', \ +// RUN: readability-identifier-naming.ConstantParameterCase: camelBack, \ +// RUN: readability-identifier-naming.ConstantParameterPrefix: 'i_', \ +// RUN: readability-identifier-naming.ParameterPackCase: camelBack, \ +// RUN: readability-identifier-naming.PureFunctionCase: lower_case, \ +// RUN: readability-identifier-naming.PureMethodCase: camelBack, \ +// RUN: readability-identifier-naming.StaticConstantCase: UPPER_CASE, \ +// RUN: readability-identifier-naming.StaticVariableCase: camelBack, \ +// RUN: readability-identifier-naming.StaticVariablePrefix: 's_', \ +// RUN: readability-identifier-naming.StructCase: lower_case, \ +// RUN: readability-identifier-naming.TemplateParameterCase: UPPER_CASE, \ +// RUN: readability-identifier-naming.TemplateTemplateParameterCase: CamelCase, \ +// RUN: readability-identifier-naming.TemplateUsingCase: lower_case, \ +// RUN: readability-identifier-naming.TemplateUsingPrefix: 'u_', \ +// RUN: readability-identifier-naming.TypeTemplateParameterCase: camelBack, \ +// RUN: readability-identifier-naming.TypeTemplateParameterSuffix: '_t', \ +// RUN: readability-identifier-naming.TypedefCase: lower_case, \ +// RUN: readability-identifier-naming.TypedefSuffix: '_t', \ +// RUN: readability-identifier-naming.UnionCase: CamelCase, \ +// RUN: readability-identifier-naming.UnionPrefix: 'U', \ +// RUN: readability-identifier-naming.UsingCase: lower_case, \ +// RUN: readability-identifier-naming.ValueTemplateParameterCase: camelBack, \ +// RUN: readability-identifier-naming.VariableCase: lower_case, \ +// RUN: readability-identifier-naming.VirtualMethodCase: Camel_Snake_Case, \ +// RUN: readability-identifier-naming.VirtualMethodPrefix: 'v_', \ +// RUN: readability-identifier-naming.MacroDefinitionCase: UPPER_CASE, \ +// RUN: readability-identifier-naming.TypeAliasCase: camel_Snake_Back, \ +// RUN: readability-identifier-naming.TypeAliasSuffix: '_t', \ +// RUN: readability-identifier-naming.IgnoreFailedSplit: false, \ +// RUN: readability-identifier-naming.GlobalPointerCase: CamelCase, \ +// RUN: readability-identifier-naming.GlobalPointerSuffix: '_Ptr', \ +// RUN: readability-identifier-naming.GlobalConstantPointerCase: UPPER_CASE, \ +// RUN: readability-identifier-naming.GlobalConstantPointerSuffix: '_Ptr', \ +// RUN: readability-identifier-naming.PointerParameterCase: lower_case, \ +// RUN: readability-identifier-naming.PointerParameterPrefix: 'p_', \ +// RUN: readability-identifier-naming.ConstantPointerParameterCase: CamelCase, \ +// RUN: readability-identifier-naming.ConstantPointerParameterPrefix: 'cp_', \ +// RUN: readability-identifier-naming.LocalPointerCase: CamelCase, \ +// RUN: readability-identifier-naming.LocalPointerPrefix: 'l_', \ +// RUN: readability-identifier-naming.LocalConstantPointerCase: CamelCase, \ +// RUN: readability-identifier-naming.LocalConstantPointerPrefix: 'lc_', \ +// RUN: }}' -- -fno-delayed-template-parsing -Dbad_macro \ // RUN: -I%S/Inputs/identifier-naming \ // RUN: -isystem %S/Inputs/identifier-naming/system diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion-allow-in-conditions.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion-allow-in-conditions.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion-allow-in-conditions.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion-allow-in-conditions.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s readability-implicit-bool-conversion %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: readability-implicit-bool-conversion.AllowIntegerConditions, value: true}, \ -// RUN: {key: readability-implicit-bool-conversion.AllowPointerConditions, value: true}]}' +// RUN: {readability-implicit-bool-conversion.AllowIntegerConditions: true, \ +// RUN: readability-implicit-bool-conversion.AllowPointerConditions: true}}' template void functionTaking(T); diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-macros.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-macros.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-macros.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s readability-inconsistent-declaration-parameter-name %t -- \ -// RUN: -config="{CheckOptions: [{key: readability-inconsistent-declaration-parameter-name.IgnoreMacros, value: false}]}" +// RUN: -config="{CheckOptions: {readability-inconsistent-declaration-parameter-name.IgnoreMacros: false}}" #define MACRO() \ void f(int x) diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-strict.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-strict.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-strict.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s readability-inconsistent-declaration-parameter-name %t -- \ -// RUN: -config="{CheckOptions: [{key: readability-inconsistent-declaration-parameter-name.Strict, value: true}]}" +// RUN: -config="{CheckOptions: {readability-inconsistent-declaration-parameter-name.Strict: true}}" void inconsistentFunction(int a, int b, int c); // CHECK-MESSAGES: :[[@LINE-1]]:6: warning: function 'inconsistentFunction' has 1 other declaration with different parameter names diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-bitfields.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-bitfields.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-bitfields.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-bitfields.cpp @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s readability-magic-numbers %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: readability-magic-numbers.IgnoredIntegerValues, value: "1;2;10;100;"}]}' \ +// RUN: {readability-magic-numbers.IgnoredIntegerValues: "1;2;10;100;"}}' \ // RUN: -- struct HardwareGateway { diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers.cpp @@ -1,10 +1,10 @@ // RUN: %check_clang_tidy %s readability-magic-numbers %t \ // RUN: -config='{CheckOptions: \ -// RUN: [{key: readability-magic-numbers.IgnoredIntegerValues, value: "0;1;2;10;100;"}, \ -// RUN: {key: readability-magic-numbers.IgnoredFloatingPointValues, value: "3.14;2.71828;9.81;10000.0;101.0;0x1.2p3"}, \ -// RUN: {key: readability-magic-numbers.IgnoreBitFieldsWidths, value: false}, \ -// RUN: {key: readability-magic-numbers.IgnorePowersOf2IntegerValues, value: true}, \ -// RUN: {key: readability-magic-numbers.IgnoreTypeAliases, value: false}]}' \ +// RUN: {readability-magic-numbers.IgnoredIntegerValues: "0;1;2;10;100;", \ +// RUN: readability-magic-numbers.IgnoredFloatingPointValues: "3.14;2.71828;9.81;10000.0;101.0;0x1.2p3", \ +// RUN: readability-magic-numbers.IgnoreBitFieldsWidths: false, \ +// RUN: readability-magic-numbers.IgnorePowersOf2IntegerValues: true, \ +// RUN: readability-magic-numbers.IgnoreTypeAliases: false}}' \ // RUN: -- template diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-access-specifiers-check-first-declaration.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-access-specifiers-check-first-declaration.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-access-specifiers-check-first-declaration.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-access-specifiers-check-first-declaration.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s readability-redundant-access-specifiers %t -- \ -// RUN: -config="{CheckOptions: [{key: readability-redundant-access-specifiers.CheckFirstDeclaration, value: true}]}" -- +// RUN: -config="{CheckOptions: {readability-redundant-access-specifiers.CheckFirstDeclaration: true}}" -- class FooPublic { private: // comment-0 diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration-ignore-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration-ignore-macros.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration-ignore-macros.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration-ignore-macros.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s readability-redundant-declaration %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: readability-redundant-declaration.IgnoreMacros, \ -// RUN: value: true}]}" +// RUN: {readability-redundant-declaration.IgnoreMacros: \ +// RUN: true}}" extern int Xyz; extern int Xyz; // Xyz diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration.cpp @@ -1,22 +1,22 @@ // RUN: %check_clang_tidy %s readability-redundant-declaration %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: readability-redundant-declaration.IgnoreMacros, \ -// RUN: value: false}]}" +// RUN: {readability-redundant-declaration.IgnoreMacros: \ +// RUN: false}}" // // With -fms-compatibility and -DEXTERNINLINE, the extern inline shouldn't // produce additional diagnostics, so same check suffix as before: // RUN: %check_clang_tidy %s readability-redundant-declaration %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: readability-redundant-declaration.IgnoreMacros, \ -// RUN: value: false}]}" -- -fms-compatibility -DEXTERNINLINE +// RUN: {readability-redundant-declaration.IgnoreMacros: \ +// RUN: false}}" -- -fms-compatibility -DEXTERNINLINE // // With -fno-ms-compatibility, DEXTERNINLINE causes additional output. // (The leading ',' means "default checks in addition to NOMSCOMPAT checks.) // RUN: %check_clang_tidy -check-suffix=,NOMSCOMPAT \ // RUN: %s readability-redundant-declaration %t -- \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: readability-redundant-declaration.IgnoreMacros, \ -// RUN: value: false}]}" -- -fno-ms-compatibility -DEXTERNINLINE +// RUN: {readability-redundant-declaration.IgnoreMacros: \ +// RUN: false}}" -- -fno-ms-compatibility -DEXTERNINLINE extern int Xyz; extern int Xyz; // Xyz diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-member-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-member-init.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-member-init.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-member-init.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s readability-redundant-member-init %t \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: readability-redundant-member-init.IgnoreBaseInCopyConstructors, \ -// RUN: value: true}] \ +// RUN: {readability-redundant-member-init.IgnoreBaseInCopyConstructors: \ +// RUN: true} \ // RUN: }" struct S { diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get-macros.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get-macros.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get-macros.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s readability-redundant-smartptr-get %t -- \ -// RUN: -config="{CheckOptions: [{key: readability-redundant-smartptr-get.IgnoreMacros, value: false}]}" +// RUN: -config="{CheckOptions: {readability-redundant-smartptr-get.IgnoreMacros: false}}" namespace std { diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-init.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-init.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-init.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s readability-redundant-string-init %t \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: readability-redundant-string-init.StringNames, \ -// RUN: value: '::std::basic_string;::std::basic_string_view;our::TestString'}] \ +// RUN: {readability-redundant-string-init.StringNames: \ +// RUN: '::std::basic_string;::std::basic_string_view;our::TestString'} \ // RUN: }" namespace std { diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr-chained-conditional-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr-chained-conditional-assignment.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr-chained-conditional-assignment.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr-chained-conditional-assignment.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s readability-simplify-boolean-expr %t -- -config="{CheckOptions: [{key: "readability-simplify-boolean-expr.ChainedConditionalAssignment", value: true}]}" -- +// RUN: %check_clang_tidy %s readability-simplify-boolean-expr %t -- -config="{CheckOptions: {readability-simplify-boolean-expr.ChainedConditionalAssignment: true}}" -- void chained_conditional_compound_assignment(int i) { bool b; diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr-chained-conditional-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr-chained-conditional-return.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr-chained-conditional-return.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr-chained-conditional-return.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s readability-simplify-boolean-expr %t -- -config="{CheckOptions: [{key: "readability-simplify-boolean-expr.ChainedConditionalReturn", value: true}]}" -- +// RUN: %check_clang_tidy %s readability-simplify-boolean-expr %t -- -config="{CheckOptions: {readability-simplify-boolean-expr.ChainedConditionalReturn: true}}" -- bool chained_conditional_compound_return(int i) { if (i < 0) { diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr-demorgan.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr-demorgan.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr-demorgan.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr-demorgan.cpp @@ -2,13 +2,13 @@ // Check when we can convert !(A Op B) -> !A InvOp !B. // RUN: %check_clang_tidy -check-suffixes=",RELAXED" %s \ -// RUN: readability-simplify-boolean-expr %t -- -config="{CheckOptions: [{ \ -// RUN: key: "readability-simplify-boolean-expr.SimplifyDeMorganRelaxed", value: true}]}" -- +// RUN: readability-simplify-boolean-expr %t -- -config="{CheckOptions: { \ +// RUN: readability-simplify-boolean-expr.SimplifyDeMorganRelaxed: true}}" -- // Verify warning issued when invalid options are specified. -// RUN: clang-tidy %s -checks=-*,readability-simplify-boolean-expr -config="{CheckOptions: [ \ -// RUN: {key: readability-simplify-boolean-expr.SimplifyDeMorgan, value: false}, \ -// RUN: {key: readability-simplify-boolean-expr.SimplifyDeMorganRelaxed, value: true}]}" \ +// RUN: clang-tidy %s -checks=-*,readability-simplify-boolean-expr -config="{CheckOptions: { \ +// RUN: readability-simplify-boolean-expr.SimplifyDeMorgan: false, \ +// RUN: readability-simplify-boolean-expr.SimplifyDeMorganRelaxed: true}}" \ // RUN: -- 2>&1 | FileCheck %s -check-prefix=CHECK-BAD-CONFIG \ // RUN: -implicit-check-not="{{warning|error}}:" diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-subscript-expr.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-subscript-expr.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-subscript-expr.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-subscript-expr.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s readability-simplify-subscript-expr %t \ // RUN: -config="{CheckOptions: \ -// RUN: [{key: readability-simplify-subscript-expr.Types, \ -// RUN: value: '::std::basic_string;::std::basic_string_view;MyVector'}]}" -- +// RUN: {readability-simplify-subscript-expr.Types: \ +// RUN: '::std::basic_string;::std::basic_string_view;MyVector'}}" -- namespace std { diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance-nesting-threshold.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance-nesting-threshold.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance-nesting-threshold.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance-nesting-threshold.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s readability-static-accessed-through-instance %t -- -config="{CheckOptions: [{key: readability-static-accessed-through-instance.NameSpecifierNestingThreshold, value: 4}]}" -- +// RUN: %check_clang_tidy %s readability-static-accessed-through-instance %t -- -config="{CheckOptions: {readability-static-accessed-through-instance.NameSpecifierNestingThreshold: 4}}" -- // Nested specifiers namespace M { diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/uniqueptr-delete-release.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/uniqueptr-delete-release.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/uniqueptr-delete-release.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/uniqueptr-delete-release.cpp @@ -1,6 +1,6 @@ // RUN: %check_clang_tidy %s readability-uniqueptr-delete-release %t -check-suffix=NULLPTR // RUN: %check_clang_tidy %s readability-uniqueptr-delete-release %t -check-suffix=RESET -config='{ \ -// RUN: CheckOptions: [{key: readability-uniqueptr-delete-release.PreferResetCall, value: true}]}' +// RUN: CheckOptions: {readability-uniqueptr-delete-release.PreferResetCall: true}}' namespace std { template struct default_delete {}; diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-custom-list.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-custom-list.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-custom-list.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-custom-list.cpp @@ -1,7 +1,7 @@ -// RUN: %check_clang_tidy %s readability-uppercase-literal-suffix %t -- -config="{CheckOptions: [{key: readability-uppercase-literal-suffix.NewSuffixes, value: 'L;uL'}]}" -- -I %clang_tidy_headers +// RUN: %check_clang_tidy %s readability-uppercase-literal-suffix %t -- -config="{CheckOptions: {readability-uppercase-literal-suffix.NewSuffixes: 'L;uL'}}" -- -I %clang_tidy_headers // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp -// RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -fix -config="{CheckOptions: [{key: readability-uppercase-literal-suffix.NewSuffixes, value: 'L;uL'}]}" -- -I %clang_tidy_headers -// RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -warnings-as-errors='-*,readability-uppercase-literal-suffix' -config="{CheckOptions: [{key: readability-uppercase-literal-suffix.NewSuffixes, value: 'L;uL'}]}" -- -I %clang_tidy_headers +// RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -fix -config="{CheckOptions: {readability-uppercase-literal-suffix.NewSuffixes: 'L;uL'}}" -- -I %clang_tidy_headers +// RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -warnings-as-errors='-*,readability-uppercase-literal-suffix' -config="{CheckOptions: {readability-uppercase-literal-suffix.NewSuffixes: 'L;uL'}}" -- -I %clang_tidy_headers #include "integral_constant.h" diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-macro.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-macro.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-macro.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s readability-uppercase-literal-suffix %t -- \ -// RUN: -config="{CheckOptions: [{key: readability-uppercase-literal-suffix.IgnoreMacros, value: false}]}" \ +// RUN: -config="{CheckOptions: {readability-uppercase-literal-suffix.IgnoreMacros: false}}" \ // RUN: -- -I %S void macros() { diff --git a/clang-tools-extra/test/clang-tidy/checkers/zircon/temporary-objects.cpp b/clang-tools-extra/test/clang-tidy/checkers/zircon/temporary-objects.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/zircon/temporary-objects.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/zircon/temporary-objects.cpp @@ -1,5 +1,5 @@ // RUN: %check_clang_tidy %s zircon-temporary-objects %t -- \ -// RUN: -config="{CheckOptions: [{key: zircon-temporary-objects.Names, value: 'Foo;NS::Bar'}]}" \ +// RUN: -config="{CheckOptions: {zircon-temporary-objects.Names: 'Foo;NS::Bar'}}" \ // RUN: -header-filter=.* // Should flag instances of Foo, NS::Bar. diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/duplicate-conflicted-fixes-of-alias-checkers.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/duplicate-conflicted-fixes-of-alias-checkers.cpp --- a/clang-tools-extra/test/clang-tidy/infrastructure/duplicate-conflicted-fixes-of-alias-checkers.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/duplicate-conflicted-fixes-of-alias-checkers.cpp @@ -1,7 +1,7 @@ // RUN: %check_clang_tidy %s cppcoreguidelines-pro-type-member-init,hicpp-member-init,modernize-use-emplace,hicpp-use-emplace %t -- \ -//// RUN: -config='{CheckOptions: [ \ -//// RUN: {key: cppcoreguidelines-pro-type-member-init.UseAssignment, value: true}, \ -//// RUN: ]}' +//// RUN: -config='{CheckOptions: { \ +//// RUN: cppcoreguidelines-pro-type-member-init.UseAssignment: true, \ +//// RUN: }}' class Foo { public: diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/expand-modular-headers-ppcallbacks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/expand-modular-headers-ppcallbacks.cpp --- a/clang-tools-extra/test/clang-tidy/infrastructure/expand-modular-headers-ppcallbacks.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/expand-modular-headers-ppcallbacks.cpp @@ -3,8 +3,8 @@ // RUN: mkdir %t // RUN: cp %S/Inputs/expand-modular-headers-ppcallbacks/* %t/ // RUN: %check_clang_tidy -std=c++11 %s readability-identifier-naming %t/without-modules -- \ -// RUN: -config="CheckOptions: [{ \ -// RUN: key: readability-identifier-naming.MacroDefinitionCase, value: UPPER_CASE }]" \ +// RUN: -config="CheckOptions: { \ +// RUN: readability-identifier-naming.MacroDefinitionCase: UPPER_CASE }" \ // RUN: -header-filter=.* --enable-module-headers-parsing \ // RUN: -- -I %t/ // @@ -12,8 +12,8 @@ // RUN: mkdir %t // RUN: cp %S/Inputs/expand-modular-headers-ppcallbacks/* %t/ // RUN: %check_clang_tidy -std=c++17 %s readability-identifier-naming %t/without-modules -- \ -// RUN: -config="CheckOptions: [{ \ -// RUN: key: readability-identifier-naming.MacroDefinitionCase, value: UPPER_CASE }]" \ +// RUN: -config="CheckOptions: { \ +// RUN: readability-identifier-naming.MacroDefinitionCase: UPPER_CASE }" \ // RUN: -header-filter=.* --enable-module-headers-parsing \ // RUN: -- -I %t/ // @@ -23,8 +23,8 @@ // RUN: mkdir %t // RUN: cp %S/Inputs/expand-modular-headers-ppcallbacks/* %t/ // RUN: %check_clang_tidy -std=c++11 %s readability-identifier-naming %t/with-modules -- \ -// RUN: -config="CheckOptions: [{ \ -// RUN: key: readability-identifier-naming.MacroDefinitionCase, value: UPPER_CASE }]" \ +// RUN: -config="CheckOptions: { \ +// RUN: readability-identifier-naming.MacroDefinitionCase: UPPER_CASE }" \ // RUN: -header-filter=.* --enable-module-headers-parsing \ // RUN: -- -I %t/ \ // RUN: -fmodules -fimplicit-modules -fno-implicit-module-maps \ @@ -35,8 +35,8 @@ // RUN: mkdir %t // RUN: cp %S/Inputs/expand-modular-headers-ppcallbacks/* %t/ // RUN: %check_clang_tidy -std=c++17 %s readability-identifier-naming %t/with-modules -- \ -// RUN: -config="CheckOptions: [{ \ -// RUN: key: readability-identifier-naming.MacroDefinitionCase, value: UPPER_CASE }]" \ +// RUN: -config="CheckOptions: { \ +// RUN: readability-identifier-naming.MacroDefinitionCase: UPPER_CASE }" \ // RUN: -header-filter=.* --enable-module-headers-parsing \ // RUN: -- -I %t/ \ // RUN: -fmodules -fimplicit-modules -fno-implicit-module-maps \ diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/run-clang-tidy.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/run-clang-tidy.cpp --- a/clang-tools-extra/test/clang-tidy/infrastructure/run-clang-tidy.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/run-clang-tidy.cpp @@ -5,8 +5,7 @@ // RUN: echo "Checks: '-*,modernize-use-auto'" > %t/.clang-tidy // RUN: echo "WarningsAsErrors: '*'" >> %t/.clang-tidy // RUN: echo "CheckOptions:" >> %t/.clang-tidy -// RUN: echo " - key: modernize-use-auto.MinTypeNameLength" >> %t/.clang-tidy -// RUN: echo " value: '0'" >> %t/.clang-tidy +// RUN: echo " modernize-use-auto.MinTypeNameLength: '0'" >> %t/.clang-tidy // RUN: cp "%s" "%t/test.cpp" // RUN: cd "%t" // RUN: not %run_clang_tidy "test.cpp" diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer-config.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer-config.cpp --- a/clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer-config.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer-config.cpp @@ -1,5 +1,5 @@ // REQUIRES: static-analyzer -// RUN: clang-tidy %s -checks='-*,clang-analyzer-unix.Malloc' -config='{CheckOptions: [{ key: "clang-analyzer-unix.DynamicMemoryModeling:Optimistic", value: true}]}' -- | FileCheck %s +// RUN: clang-tidy %s -checks='-*,clang-analyzer-unix.Malloc' -config='{CheckOptions: { "clang-analyzer-unix.DynamicMemoryModeling:Optimistic": true}}' -- | FileCheck %s typedef __typeof(sizeof(int)) size_t; void *malloc(size_t); void free(void *); diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/verify-config.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/verify-config.cpp --- a/clang-tools-extra/test/clang-tidy/infrastructure/verify-config.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/verify-config.cpp @@ -5,10 +5,10 @@ // RUN: --checks='-*,bad*glob,llvm*,llvm-includeorder,my-made-up-check' --config='{Checks: "readability-else-after-ret", \ // RUN: HeaderFileExtensions: ["h", "hh", "hpp"], \ // RUN: ImplementationFileExtensions: ["c", "cc", "hpp"], \ -// RUN: CheckOptions: [{key: "IgnoreMacros", value: "true"}, \ -// RUN: {key: "StriceMode", value: "true"}, \ -// RUN: {key: modernize-lop-convert.UseCxx20ReverseRanges, value: true} \ -// RUN: ]}' 2>&1 | FileCheck %s \ +// RUN: CheckOptions: {IgnoreMacros: true, \ +// RUN: StriceMode: true, \ +// RUN: modernize-lop-convert.UseCxx20ReverseRanges: true \ +// RUN: }}' 2>&1 | FileCheck %s \ // RUN: -check-prefix=CHECK-VERIFY -implicit-check-not='{{warning|error}}:' // CHECK-VERIFY-DAG: command-line option '-config': warning: unknown check 'readability-else-after-ret'; did you mean 'readability-else-after-return' [-verify-config]