Formatting/Linting fixes

AyodeAwe · Jul 14, 2023 · d0aa315 · d0aa315
1 parent f6053ed
commit d0aa315
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 29 deletions.
diff --git a/ci/scripts/fix_all.sh b/ci/scripts/fix_all.sh
@@ -29,6 +29,23 @@ if [[ "${SKIP_COPYRIGHT}" == "" ]]; then
    python3 ./ci/scripts/copyright.py --fix-all --git-modified-only ./ 2>&1
 fi
 
+# Run include-what-you-use (before clang-format so it can fix the include order)
+if [[ "${SKIP_IWYU}" == "" ]]; then
+
+   if [[ "${IWYU_TOOL}" == "" ]]; then
+      IWYU_TOOL=$(find_iwyu_tool)
+   fi
+
+   if [[ -x "${IWYU_TOOL}" ]]; then
+      echo "Running include-what-you-use from '${IWYU_TOOL}'..."
+      set -x
+      ${IWYU_TOOL} -j $(get_num_proc) -p ${BUILD_DIR} cpp python | fix_includes.py --nosafe_headers --nocomments
+      set +x
+   else
+      echo "Skipping include-what-you-use. Could not find iwyu_tool.py at '${IWYU_TOOL}'"
+   fi
+fi
+
 # Run clang-format
 if [[ "${SKIP_CLANG_FORMAT}" == "" ]]; then
 
@@ -56,21 +73,6 @@ if [[ "${SKIP_CLANG_TIDY}" == "" ]]; then
    fi
 fi
 
-# Run include-what-you-use
-if [[ "${SKIP_IWYU}" == "" ]]; then
-
-   if [[ "${IWYU_TOOL}" == "" ]]; then
-      IWYU_TOOL=$(find_iwyu_tool)
-   fi
-
-   if [[ -x "${IWYU_TOOL}" ]]; then
-      echo "Running include-what-you-use from '${IWYU_TOOL}'..."
-      ${IWYU_TOOL} -j 0 -p ${BUILD_DIR} ${CPP_MODIFIED_FILES[@]} 2>&1
-   else
-      echo "Skipping include-what-you-use. Could not find iwyu_tool.py at '${IWYU_TOOL}'"
-   fi
-fi
-
 # Run isort
 if [[ "${SKIP_ISORT}" == "" ]]; then
    echo "Running isort..."

diff --git a/cpp/mrc/include/mrc/core/concepts/not_void.hpp b/cpp/mrc/include/mrc/core/concepts/not_void.hpp
@@ -22,9 +22,6 @@
 namespace mrc::core::concepts {
 
 template <typename T>
-concept not_void = requires
-{
-    requires not std::same_as<T, void>;
-};
+concept not_void = requires { requires not std::same_as<T, void>; };
 
 }  // namespace mrc::core::concepts
diff --git a/cpp/mrc/include/mrc/experimental/modules/stream_buffer/stream_buffer_traits.hpp b/cpp/mrc/include/mrc/experimental/modules/stream_buffer/stream_buffer_traits.hpp
@@ -25,9 +25,8 @@
 namespace mrc::modules::stream_buffers {
 
 template <typename DataTypeT, template <typename> class StreamBufferTypeT>
-concept IsStreamBuffer = requires
-{
-    typename StreamBufferTypeT<DataTypeT>;
-    std::is_base_of_v<StreamBufferBase<DataTypeT>, StreamBufferTypeT<DataTypeT>>;
-};
+concept IsStreamBuffer = requires {
+                             typename StreamBufferTypeT<DataTypeT>;
+                             std::is_base_of_v<StreamBufferBase<DataTypeT>, StreamBufferTypeT<DataTypeT>>;
+                         };
 }  // namespace mrc::modules::stream_buffers
diff --git a/cpp/mrc/src/public/benchmarking/tracer.cpp b/cpp/mrc/src/public/benchmarking/tracer.cpp
@@ -232,11 +232,11 @@ void TraceAggregatorBase::process_tracer_data(const std::vector<std::shared_ptr<
     m_node_count      = segment_node_count;
     m_tracer_count    = tracers.size();
     m_json_data       = {
-              {
-                  "metadata",
-                  {{"elapsed_time", m_elapsed_seconds}, {"tracer_count", m_tracer_count}, {"node_count", m_node_count}},
+        {
+            "metadata",
+            {{"elapsed_time", m_elapsed_seconds}, {"tracer_count", m_tracer_count}, {"node_count", m_node_count}},
         },
-              {"aggregations", {}}};
+        {"aggregations", {}}};
 
     if (!cmpt_id_to_name.empty())
     {

diff --git a/cpp/mrc/src/tools/topology_exporter.cpp b/cpp/mrc/src/tools/topology_exporter.cpp
@@ -28,7 +28,6 @@
 #include <memory>
 
 using namespace mrc;
-using namespace internal;
 
 int main(int argc, char* argv[])
 {