Skip to content

Commit 179098a

Browse files
committed
update msg; only warn for global only options"
1 parent 98d65a0 commit 179098a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

clang-tools-extra/clang-tidy/ClangTidyCheck.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ findPriorityOption(const ClangTidyOptions::OptionMap &Options,
7979
auto IterLocal = Options.find((NamePrefix + LocalName).str());
8080
auto IterGlobal = Options.find(LocalName);
8181
// FIXME: temporary solution for deprecation warnings, should be removed
82-
// after 22.x.
83-
if (IterGlobal != Options.end() &&
82+
// after 22.x. Warn configuration deps on deprecation global options.
83+
if (IterLocal == Options.end() && IterGlobal != Options.end() &&
8484
DeprecatedGlobalOptions.contains(LocalName))
8585
Context->configurationDiag(
86-
"deprecation global option '%0', please use '%1%0'.")
86+
"global option '%0' is deprecated, please use '%1%0' instead.")
8787
<< LocalName << NamePrefix;
8888
if (IterLocal == Options.end())
8989
return IterGlobal;

0 commit comments

Comments
 (0)