Trajopt clang-tidy clean-up v3 (#414)

tesseract-robotics · Jul 16, 2024 · efd9b8d · efd9b8d
1 parent 4a908dd
commit efd9b8d
Show file tree

Hide file tree

Showing 97 changed files with 1,237 additions and 1,202 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,78 +1,76 @@
 ---
 Checks: >
     -*,
-    clang-diagnostic-*,
-    -clang-diagnostic-unknown-warning-option,
-    clang-analyzer-*,
-    -clang-analyzer-cplusplus*,
     bugprone-*,
     -bugprone-easily-swappable-parameters,
-    -bugprone-exception-escape,
+    clang-analyzer-*,
+    -clang-analyzer-cplusplus*,
+    clang-diagnostic-*,
     cppcoreguidelines-*,
-    -cppcoreguidelines-macro-usage,
-    -cppcoreguidelines-pro-type-static-cast-downcast,
-    -cppcoreguidelines-pro-type-vararg,
-    -cppcoreguidelines-pro-type-union-access,
-    -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-    -cppcoreguidelines-pro-bounds-pointer-arithmetic,
-    -cppcoreguidelines-pro-bounds-constant-array-index,
+    -cppcoreguidelines-avoid-const-or-ref-data-members,
     -cppcoreguidelines-avoid-magic-numbers,
+    -cppcoreguidelines-macro-usage,
     -cppcoreguidelines-non-private-member-variables-in-classes,
     -cppcoreguidelines-owning-memory,
+    -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
+    -cppcoreguidelines-pro-bounds-constant-array-index,
+    -cppcoreguidelines-pro-bounds-pointer-arithmetic,
+    -cppcoreguidelines-pro-type-static-cast-downcast,
+    -cppcoreguidelines-pro-type-union-access,
+    -cppcoreguidelines-pro-type-vararg,
     misc-*,
     -misc-include-cleaner,
-    -misc-non-private-member-variables-in-classes,
     -misc-no-recursion,
+    -misc-non-private-member-variables-in-classes,
     modernize-*,
-    -modernize-use-trailing-return-type,
     -modernize-use-nodiscard,
+    -modernize-use-trailing-return-type,
     performance-*,
     readability-*,
+    -readability-avoid-unconditional-preprocessor-if,
     -readability-braces-around-statements,
-    -readability-named-parameter,
-    -readability-magic-numbers,
-    -readability-isolate-declaration,
     -readability-function-cognitive-complexity,
-    -readability-use-anyofallof,
     -readability-identifier-length,
-    -readability-suspicious-call-argument
+    -readability-magic-numbers,
+    -readability-named-parameter,
+    -readability-suspicious-call-argument,
 WarningsAsErrors: >
     -*,
-    clang-diagnostic-*,
-    -clang-diagnostic-unknown-warning-option,
-    clang-analyzer-*,
-    -clang-analyzer-cplusplus*,
     bugprone-*,
     -bugprone-easily-swappable-parameters,
-    -bugprone-exception-escape,
+    clang-analyzer-*,
+    -clang-analyzer-core.uninitialized.UndefReturn,
+    -clang-analyzer-cplusplus*,
+    -clang-analyzer-optin.core.EnumCastOutOfRange,
+    clang-diagnostic-*,
     cppcoreguidelines-*,
-    -cppcoreguidelines-macro-usage,
-    -cppcoreguidelines-pro-type-static-cast-downcast,
-    -cppcoreguidelines-pro-type-vararg,
-    -cppcoreguidelines-pro-type-union-access,
-    -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-    -cppcoreguidelines-pro-bounds-pointer-arithmetic,
-    -cppcoreguidelines-pro-bounds-constant-array-index,
+    -cppcoreguidelines-avoid-const-or-ref-data-members,
     -cppcoreguidelines-avoid-magic-numbers,
+    -cppcoreguidelines-macro-usage,
     -cppcoreguidelines-non-private-member-variables-in-classes,
     -cppcoreguidelines-owning-memory,
+    -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
+    -cppcoreguidelines-pro-bounds-constant-array-index,
+    -cppcoreguidelines-pro-bounds-pointer-arithmetic,
+    -cppcoreguidelines-pro-type-static-cast-downcast,
+    -cppcoreguidelines-pro-type-union-access,
+    -cppcoreguidelines-pro-type-vararg,
     misc-*,
     -misc-include-cleaner,
-    -misc-non-private-member-variables-in-classes,
     -misc-no-recursion,
+    -misc-non-private-member-variables-in-classes,
     modernize-*,
-    -modernize-use-trailing-return-type,
     -modernize-use-nodiscard,
+    -modernize-use-trailing-return-type,
     performance-*,
     readability-*,
+    -readability-avoid-unconditional-preprocessor-if,
     -readability-braces-around-statements,
-    -readability-named-parameter,
-    -readability-magic-numbers,
-    -readability-isolate-declaration,
-    -readability-function-cognitive-complexity
-    -readability-use-anyofallof,
+    -readability-function-cognitive-complexity,
     -readability-identifier-length,
-    -readability-suspicious-call-argument
+    -readability-magic-numbers,
+    -readability-named-parameter,
+    -readability-suspicious-call-argument,
 HeaderFilterRegex: '.*'
 FormatStyle:     none
 CheckOptions:

diff --git a/trajopt/include/trajopt/problem_description.hpp b/trajopt/include/trajopt/problem_description.hpp
@@ -35,25 +35,25 @@ enum class TermType : char
 
 inline TermType operator|(TermType lhs, TermType rhs)
 {
-  using T = std::underlying_type<TermType>::type;
+  using T = std::underlying_type_t<TermType>;
   return TermType(static_cast<T>(lhs) | static_cast<T>(rhs));
 }
 
 inline TermType operator&(TermType lhs, TermType rhs)
 {
-  using T = std::underlying_type<TermType>::type;
+  using T = std::underlying_type_t<TermType>;
   return TermType(static_cast<T>(lhs) & static_cast<T>(rhs));
 }
 
 inline TermType operator^(TermType lhs, TermType rhs)
 {
-  using T = std::underlying_type<TermType>::type;
+  using T = std::underlying_type_t<TermType>;
   return TermType(static_cast<T>(lhs) ^ static_cast<T>(rhs));
 }
 
 inline TermType operator~(TermType rhs)
 {
-  using T = std::underlying_type<TermType>::type;
+  using T = std::underlying_type_t<TermType>;
   return TermType(~static_cast<T>(rhs));
 }
 

diff --git a/trajopt/include/trajopt/typedefs.hpp b/trajopt/include/trajopt/typedefs.hpp
@@ -84,7 +84,7 @@ class TrajOptCostFromErrFunc : public sco::CostFromErrFunc, public Plotter
     // If error function has a inherited from TrajOptVectorOfVector, call its Plot function
     if (auto* plt = dynamic_cast<TrajOptVectorOfVector*>(f_.get()))
     {
-      Eigen::VectorXd dof_vals = sco::getVec(x, vars_);
+      const Eigen::VectorXd dof_vals = sco::getVec(x, vars_);
       plt->Plot(plotter, dof_vals);
     }
   }
@@ -120,7 +120,7 @@ class TrajOptConstraintFromErrFunc : public sco::ConstraintFromErrFunc, public P
     // If error function has a inherited from TrajOptVectorOfVector, call its Plot function
     if (auto* plt = dynamic_cast<TrajOptVectorOfVector*>(f_.get()))
     {
-      Eigen::VectorXd dof_vals = sco::getVec(x, vars_);
+      const Eigen::VectorXd dof_vals = sco::getVec(x, vars_);
       plt->Plot(plotter, dof_vals);
     }
   }