[clang-tidy] Move misc-use-override and readability-shrink-to-fit to "modernize/"
These checks are focusing on migrating the code from C++98/03 to C++11, so they
belong to the modernize module.
llvm-svn: 246437
diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
index 28b096f..0e69a80 100644
--- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
@@ -19,7 +19,6 @@
UnusedParametersCheck.cpp
UnusedRAIICheck.cpp
UniqueptrResetReleaseCheck.cpp
- UseOverrideCheck.cpp
LINK_LIBS
clangAST
diff --git a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
index b82bdf8..9976131 100644
--- a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
+++ b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
@@ -27,7 +27,6 @@
#include "UnusedAliasDeclsCheck.h"
#include "UnusedParametersCheck.h"
#include "UnusedRAIICheck.h"
-#include "UseOverrideCheck.h"
namespace clang {
namespace tidy {
@@ -68,7 +67,6 @@
CheckFactories.registerCheck<UnusedParametersCheck>(
"misc-unused-parameters");
CheckFactories.registerCheck<UnusedRAIICheck>("misc-unused-raii");
- CheckFactories.registerCheck<UseOverrideCheck>("misc-use-override");
}
};
diff --git a/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt b/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
index 1d575af5..1858924 100644
--- a/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
@@ -6,8 +6,10 @@
ModernizeTidyModule.cpp
PassByValueCheck.cpp
ReplaceAutoPtrCheck.cpp
+ ShrinkToFitCheck.cpp
UseAutoCheck.cpp
UseNullptrCheck.cpp
+ UseOverrideCheck.cpp
LINK_LIBS
clangAST
diff --git a/clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp b/clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp
index 71c6221..ff0666f 100644
--- a/clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp
@@ -13,8 +13,10 @@
#include "LoopConvertCheck.h"
#include "PassByValueCheck.h"
#include "ReplaceAutoPtrCheck.h"
+#include "ShrinkToFitCheck.h"
#include "UseAutoCheck.h"
#include "UseNullptrCheck.h"
+#include "UseOverrideCheck.h"
using namespace clang::ast_matchers;
@@ -29,8 +31,10 @@
CheckFactories.registerCheck<PassByValueCheck>("modernize-pass-by-value");
CheckFactories.registerCheck<ReplaceAutoPtrCheck>(
"modernize-replace-auto-ptr");
+ CheckFactories.registerCheck<ShrinkToFitCheck>("modernize-shrink-to-fit");
CheckFactories.registerCheck<UseAutoCheck>("modernize-use-auto");
CheckFactories.registerCheck<UseNullptrCheck>("modernize-use-nullptr");
+ CheckFactories.registerCheck<UseOverrideCheck>("modernize-use-override");
}
ClangTidyOptions getModuleOptions() override {
diff --git a/clang-tools-extra/clang-tidy/readability/ShrinkToFitCheck.cpp b/clang-tools-extra/clang-tidy/modernize/ShrinkToFitCheck.cpp
similarity index 98%
rename from clang-tools-extra/clang-tidy/readability/ShrinkToFitCheck.cpp
rename to clang-tools-extra/clang-tidy/modernize/ShrinkToFitCheck.cpp
index bbaec7a..c5e9e5e 100644
--- a/clang-tools-extra/clang-tidy/readability/ShrinkToFitCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/ShrinkToFitCheck.cpp
@@ -33,7 +33,7 @@
} // namespace
namespace tidy {
-namespace readability {
+namespace modernize {
void ShrinkToFitCheck::registerMatchers(MatchFinder *Finder) {
// Swap as a function need not to be considered, because rvalue can not
@@ -99,6 +99,6 @@
<< Hint;
}
-} // namespace readability
+} // namespace modernize
} // namespace tidy
} // namespace clang
diff --git a/clang-tools-extra/clang-tidy/readability/ShrinkToFitCheck.h b/clang-tools-extra/clang-tidy/modernize/ShrinkToFitCheck.h
similarity index 80%
rename from clang-tools-extra/clang-tidy/readability/ShrinkToFitCheck.h
rename to clang-tools-extra/clang-tidy/modernize/ShrinkToFitCheck.h
index 537a087..1e3745c 100644
--- a/clang-tools-extra/clang-tidy/readability/ShrinkToFitCheck.h
+++ b/clang-tools-extra/clang-tidy/modernize/ShrinkToFitCheck.h
@@ -7,14 +7,14 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_READABILITY_SHRINKTOFITCHECK_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_READABILITY_SHRINKTOFITCHECK_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_SHRINKTOFITCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_SHRINKTOFITCHECK_H
#include "../ClangTidy.h"
namespace clang {
namespace tidy {
-namespace readability {
+namespace modernize {
/// Replace copy and swap tricks on shrinkable containers with the
/// `shrink_to_fit()` method call.
@@ -30,8 +30,8 @@
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
};
-} // namespace readability
+} // namespace modernize
} // namespace tidy
} // namespace clang
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_READABILITY_SHRINKTOFITCHECK_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_SHRINKTOFITCHECK_H
diff --git a/clang-tools-extra/clang-tidy/misc/UseOverrideCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseOverrideCheck.cpp
similarity index 99%
rename from clang-tools-extra/clang-tidy/misc/UseOverrideCheck.cpp
rename to clang-tools-extra/clang-tidy/modernize/UseOverrideCheck.cpp
index 1c9b9ab..e506e83 100644
--- a/clang-tools-extra/clang-tidy/misc/UseOverrideCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseOverrideCheck.cpp
@@ -16,7 +16,7 @@
namespace clang {
namespace tidy {
-namespace misc {
+namespace modernize {
void UseOverrideCheck::registerMatchers(MatchFinder *Finder) {
// Only register the matcher for C++11.
@@ -192,6 +192,6 @@
}
}
-} // namespace misc
+} // namespace modernize
} // namespace tidy
} // namespace clang
diff --git a/clang-tools-extra/clang-tidy/misc/UseOverrideCheck.h b/clang-tools-extra/clang-tidy/modernize/UseOverrideCheck.h
similarity index 75%
rename from clang-tools-extra/clang-tidy/misc/UseOverrideCheck.h
rename to clang-tools-extra/clang-tidy/modernize/UseOverrideCheck.h
index 299009fd..83ce7da 100644
--- a/clang-tools-extra/clang-tidy/misc/UseOverrideCheck.h
+++ b/clang-tools-extra/clang-tidy/modernize/UseOverrideCheck.h
@@ -7,14 +7,14 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_USEOVERRIDECHECK_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_USEOVERRIDECHECK_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_USEOVERRIDECHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_USEOVERRIDECHECK_H
#include "../ClangTidy.h"
namespace clang {
namespace tidy {
-namespace misc {
+namespace modernize {
/// Use C++11's `override` and remove `virtual` where applicable.
class UseOverrideCheck : public ClangTidyCheck {
@@ -25,8 +25,8 @@
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
};
-} // namespace misc
+} // namespace modernize
} // namespace tidy
} // namespace clang
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_USEOVERRIDECHECK_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_USEOVERRIDECHECK_H
diff --git a/clang-tools-extra/clang-tidy/readability/CMakeLists.txt b/clang-tools-extra/clang-tidy/readability/CMakeLists.txt
index 1cdb368..0584168 100644
--- a/clang-tools-extra/clang-tidy/readability/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/readability/CMakeLists.txt
@@ -11,7 +11,6 @@
ReadabilityTidyModule.cpp
RedundantStringCStrCheck.cpp
RedundantSmartptrGetCheck.cpp
- ShrinkToFitCheck.cpp
SimplifyBooleanExprCheck.cpp
LINK_LIBS
diff --git a/clang-tools-extra/clang-tidy/readability/ReadabilityTidyModule.cpp b/clang-tools-extra/clang-tidy/readability/ReadabilityTidyModule.cpp
index dd37e34..6efcbfa 100644
--- a/clang-tools-extra/clang-tidy/readability/ReadabilityTidyModule.cpp
+++ b/clang-tools-extra/clang-tidy/readability/ReadabilityTidyModule.cpp
@@ -18,7 +18,6 @@
#include "NamedParameterCheck.h"
#include "RedundantSmartptrGetCheck.h"
#include "RedundantStringCStrCheck.h"
-#include "ShrinkToFitCheck.h"
#include "SimplifyBooleanExprCheck.h"
namespace clang {
@@ -44,8 +43,6 @@
"readability-redundant-smartptr-get");
CheckFactories.registerCheck<RedundantStringCStrCheck>(
"readability-redundant-string-cstr");
- CheckFactories.registerCheck<ShrinkToFitCheck>(
- "readability-shrink-to-fit");
CheckFactories.registerCheck<SimplifyBooleanExprCheck>(
"readability-simplify-boolean-expr");
}
diff --git a/clang-tools-extra/docs/clang-tidy/checks/list.rst b/clang-tools-extra/docs/clang-tidy/checks/list.rst
index 1f10dcb..05aebe8 100644
--- a/clang-tools-extra/docs/clang-tidy/checks/list.rst
+++ b/clang-tools-extra/docs/clang-tidy/checks/list.rst
@@ -38,10 +38,11 @@
misc-unused-alias-decls
misc-unused-parameters
misc-unused-raii
- misc-use-override
modernize-loop-convert
modernize-pass-by-value
+ modernize-shrink-to-fit
modernize-use-nullptr
+ modernize-use-override
readability-braces-around-statements
readability-container-size-empty
readability-else-after-return
@@ -50,5 +51,4 @@
readability-named-parameter
readability-redundant-smartptr-get
readability-redundant-string-cstr
- readability-shrink-to-fit
- readability-simplify-boolean-expr
\ No newline at end of file
+ readability-simplify-boolean-expr
diff --git a/clang-tools-extra/docs/clang-tidy/checks/misc-use-override.rst b/clang-tools-extra/docs/clang-tidy/checks/misc-use-override.rst
deleted file mode 100644
index d579507..0000000
--- a/clang-tools-extra/docs/clang-tidy/checks/misc-use-override.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-misc-use-override
-=================
-
-
-Use C++11's ``override`` and remove ``virtual`` where applicable.
diff --git a/clang-tools-extra/docs/clang-tidy/checks/readability-shrink-to-fit.rst b/clang-tools-extra/docs/clang-tidy/checks/modernize-shrink-to-fit.rst
similarity index 100%
rename from clang-tools-extra/docs/clang-tidy/checks/readability-shrink-to-fit.rst
rename to clang-tools-extra/docs/clang-tidy/checks/modernize-shrink-to-fit.rst
diff --git a/clang-tools-extra/docs/clang-tidy/checks/modernize-use-override.rst b/clang-tools-extra/docs/clang-tidy/checks/modernize-use-override.rst
new file mode 100644
index 0000000..47ed011
--- /dev/null
+++ b/clang-tools-extra/docs/clang-tidy/checks/modernize-use-override.rst
@@ -0,0 +1,5 @@
+modernize-use-override
+======================
+
+
+Use C++11's ``override`` and remove ``virtual`` where applicable.
diff --git a/clang-tools-extra/docs/clang-tidy/index.rst b/clang-tools-extra/docs/clang-tidy/index.rst
index cc76bb7..ab36389 100644
--- a/clang-tools-extra/docs/clang-tidy/index.rst
+++ b/clang-tools-extra/docs/clang-tidy/index.rst
@@ -53,8 +53,14 @@
* Checks related to the Google coding conventions have names starting with
``google-``.
-* Checks with names starting with ``misc-`` don't relate to any particular
- coding style.
+* Checks named ``modernize-*`` advocate the usage of modern (currently "modern"
+ means "C++11") language constructs.
+
+* The ``readability-`` checks target readability-related issues that don't
+ relate to any particular coding style.
+
+* Checks with names starting with ``misc-`` the checks that we didn't have a
+ better category for.
* Clang static analyzer checks are named starting with ``clang-analyzer-``.
@@ -494,8 +500,8 @@
* The default set of checks can be overridden using the ``-checks`` argument,
taking the identical format as :program:`clang-tidy` does. For example
- ``-checks=-*,misc-use-override`` will run the ``misc-use-override``
- checker only.
+ ``-checks=-*,modernize-use-override`` will run the ``modernize-use-override``
+ check only.
* To restrict the files examined you can provide one or more regex arguments
that the file names are matched against.
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp b/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp
index 9b9d7ba..f024195 100644
--- a/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp
+++ b/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp
@@ -1,6 +1,6 @@
// RUN: sed 's/placeholder_for_f/f/' %s > %t.cpp
-// RUN: clang-tidy -checks=-*,misc-use-override %t.cpp -- -std=c++11 | FileCheck -check-prefix=CHECK-SANITY %s
-// RUN: not diff -U0 %s %t.cpp | %python %S/../../clang-tidy/tool/clang-tidy-diff.py -checks=-*,misc-use-override -- -std=c++11 2>&1 | FileCheck %s
+// RUN: clang-tidy -checks=-*,modernize-use-override %t.cpp -- -std=c++11 | FileCheck -check-prefix=CHECK-SANITY %s
+// RUN: not diff -U0 %s %t.cpp | %python %S/../../clang-tidy/tool/clang-tidy-diff.py -checks=-*,modernize-use-override -- -std=c++11 2>&1 | FileCheck %s
struct A {
virtual void f() {}
virtual void g() {}
diff --git a/clang-tools-extra/test/clang-tidy/diagnostic.cpp b/clang-tools-extra/test/clang-tidy/diagnostic.cpp
index 92ee515..a9eefed 100644
--- a/clang-tools-extra/test/clang-tidy/diagnostic.cpp
+++ b/clang-tools-extra/test/clang-tidy/diagnostic.cpp
@@ -1,7 +1,7 @@
-// RUN: clang-tidy -checks='-*,misc-use-override' %s.nonexistent.cpp -- | FileCheck -check-prefix=CHECK1 %s
+// RUN: clang-tidy -checks='-*,modernize-use-override' %s.nonexistent.cpp -- | FileCheck -check-prefix=CHECK1 %s
// RUN: clang-tidy -checks='-*,clang-diagnostic-*,google-explicit-constructor' %s -- -fan-unknown-option | FileCheck -check-prefix=CHECK2 %s
// RUN: clang-tidy -checks='-*,google-explicit-constructor,clang-diagnostic-literal-conversion' %s -- -fan-unknown-option | FileCheck -check-prefix=CHECK3 %s
-// RUN: clang-tidy -checks='-*,misc-use-override,clang-diagnostic-macro-redefined' %s -- -DMACRO_FROM_COMMAND_LINE | FileCheck -check-prefix=CHECK4 %s
+// RUN: clang-tidy -checks='-*,modernize-use-override,clang-diagnostic-macro-redefined' %s -- -DMACRO_FROM_COMMAND_LINE | FileCheck -check-prefix=CHECK4 %s
// CHECK1-NOT: warning
// CHECK2-NOT: warning
diff --git a/clang-tools-extra/test/clang-tidy/readability-shrink-to-fit.cpp b/clang-tools-extra/test/clang-tidy/modernize-shrink-to-fit.cpp
similarity index 95%
rename from clang-tools-extra/test/clang-tidy/readability-shrink-to-fit.cpp
rename to clang-tools-extra/test/clang-tidy/modernize-shrink-to-fit.cpp
index 30715eb..e369488 100644
--- a/clang-tools-extra/test/clang-tidy/readability-shrink-to-fit.cpp
+++ b/clang-tools-extra/test/clang-tidy/modernize-shrink-to-fit.cpp
@@ -1,4 +1,4 @@
-// RUN: %python %S/check_clang_tidy.py %s readability-shrink-to-fit %t
+// RUN: %python %S/check_clang_tidy.py %s modernize-shrink-to-fit %t
namespace std {
template <typename T> struct vector { void swap(vector &other); };
@@ -8,7 +8,7 @@
std::vector<int> v;
std::vector<int>(v).swap(v);
- // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: the shrink_to_fit method should be used to reduce the capacity of a shrinkable container [readability-shrink-to-fit]
+ // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: the shrink_to_fit method should be used to reduce the capacity of a shrinkable container [modernize-shrink-to-fit]
// CHECK-FIXES: {{^ }}v.shrink_to_fit();{{$}}
std::vector<int> &vref = v;
diff --git a/clang-tools-extra/test/clang-tidy/misc-use-override-cxx98.cpp b/clang-tools-extra/test/clang-tidy/modernize-use-override-cxx98.cpp
similarity index 79%
rename from clang-tools-extra/test/clang-tidy/misc-use-override-cxx98.cpp
rename to clang-tools-extra/test/clang-tidy/modernize-use-override-cxx98.cpp
index 5928e36..c061e8a 100644
--- a/clang-tools-extra/test/clang-tidy/misc-use-override-cxx98.cpp
+++ b/clang-tools-extra/test/clang-tidy/modernize-use-override-cxx98.cpp
@@ -1,4 +1,4 @@
-// RUN: %python %S/check_clang_tidy.py %s misc-use-override %t -- -std=c++98
+// RUN: %python %S/check_clang_tidy.py %s modernize-use-override %t -- -std=c++98
struct Base {
virtual ~Base() {}
diff --git a/clang-tools-extra/test/clang-tidy/misc-use-override.cpp b/clang-tools-extra/test/clang-tidy/modernize-use-override.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/misc-use-override.cpp
rename to clang-tools-extra/test/clang-tidy/modernize-use-override.cpp
index ba9e559..8d6dfaf 100644
--- a/clang-tools-extra/test/clang-tidy/misc-use-override.cpp
+++ b/clang-tools-extra/test/clang-tidy/modernize-use-override.cpp
@@ -1,4 +1,4 @@
-// RUN: %python %S/check_clang_tidy.py %s misc-use-override %t
+// RUN: %python %S/check_clang_tidy.py %s modernize-use-override %t
#define ABSTRACT = 0
@@ -42,7 +42,7 @@
struct SimpleCases : public Base {
public:
virtual ~SimpleCases();
- // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: prefer using 'override' or (rarely) 'final' instead of 'virtual'
+ // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: prefer using 'override' or (rarely) 'final' instead of 'virtual' [modernize-use-override]
// CHECK-FIXES: {{^}} ~SimpleCases() override;
void a();