From ff68efa3647b9d45e36646901644ea8c2412a8ef Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Sat, 26 Aug 2023 19:25:21 -0700 Subject: [PATCH] Include thirdparty libraries with angle brackets --- .styleguide | 19 ++++++++++--------- .../native/cpp/AnalysisTest.cpp | 2 +- .../native/cpp/Main.cpp | 2 +- .../native/cpp/GenerationTest.cpp | 2 +- .../native/cpp/Main.cpp | 2 +- .../native/cpp/IntegrationUtils.cpp | 3 +-- .../src/test/native/cpp/Main.cpp | 2 +- .../native/cpp/analysis/AnalysisTypeTest.cpp | 3 ++- .../cpp/analysis/FeedbackAnalysisTest.cpp | 3 ++- .../cpp/analysis/FeedforwardAnalysisTest.cpp | 2 +- .../test/native/cpp/analysis/FilterTest.cpp | 3 ++- .../src/test/native/cpp/analysis/OLSTest.cpp | 3 ++- .../cpp/analysis/TrackWidthAnalysisTest.cpp | 3 ++- .../test/native/cpp/deploy/DeployJSONTest.cpp | 2 +- .../cpp/generation/HardwareTypeTest.cpp | 3 ++- 15 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.styleguide b/.styleguide index ab45c58f..c2e73a94 100644 --- a/.styleguide +++ b/.styleguide @@ -20,21 +20,22 @@ repoRootNameOverride { } includeOtherLibs { - ^glass - ^GLFW - ^cscore - ^ctre - ^Eigen + ^Eigen/ + ^GLFW/ + ^cscore/ + ^ctre/ ^fmt/ - ^frc + ^frc/ + ^glass/ + ^gtest/ ^imgui ^implot\.h$ - ^libssh + ^libssh/ ^networktables/ ^portable-file-dialogs ^rev/ - ^units - ^uv + ^units/ + ^uv/ ^wpi/ ^wpigui ^wpimath/ diff --git a/sysid-application/src/integrationtest-analysis/native/cpp/AnalysisTest.cpp b/sysid-application/src/integrationtest-analysis/native/cpp/AnalysisTest.cpp index e7bd515a..f9a6a6b7 100644 --- a/sysid-application/src/integrationtest-analysis/native/cpp/AnalysisTest.cpp +++ b/sysid-application/src/integrationtest-analysis/native/cpp/AnalysisTest.cpp @@ -8,13 +8,13 @@ #include #include +#include #include #include #include #include #include "IntegrationUtils.h" -#include "gtest/gtest.h" #include "sysid/Util.h" #include "sysid/analysis/AnalysisManager.h" #include "sysid/analysis/AnalysisType.h" diff --git a/sysid-application/src/integrationtest-analysis/native/cpp/Main.cpp b/sysid-application/src/integrationtest-analysis/native/cpp/Main.cpp index 09072ee3..e993c1f1 100644 --- a/sysid-application/src/integrationtest-analysis/native/cpp/Main.cpp +++ b/sysid-application/src/integrationtest-analysis/native/cpp/Main.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "gtest/gtest.h" +#include int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); diff --git a/sysid-application/src/integrationtest-generation/native/cpp/GenerationTest.cpp b/sysid-application/src/integrationtest-generation/native/cpp/GenerationTest.cpp index fb6ee346..5dc2b987 100644 --- a/sysid-application/src/integrationtest-generation/native/cpp/GenerationTest.cpp +++ b/sysid-application/src/integrationtest-generation/native/cpp/GenerationTest.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -20,7 +21,6 @@ #include #include "IntegrationUtils.h" -#include "gtest/gtest.h" #include "sysid/Util.h" #include "sysid/generation/ConfigManager.h" #include "sysid/generation/HardwareType.h" diff --git a/sysid-application/src/integrationtest-generation/native/cpp/Main.cpp b/sysid-application/src/integrationtest-generation/native/cpp/Main.cpp index 09072ee3..e993c1f1 100644 --- a/sysid-application/src/integrationtest-generation/native/cpp/Main.cpp +++ b/sysid-application/src/integrationtest-generation/native/cpp/Main.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "gtest/gtest.h" +#include int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); diff --git a/sysid-application/src/integrationtest-utils/native/cpp/IntegrationUtils.cpp b/sysid-application/src/integrationtest-utils/native/cpp/IntegrationUtils.cpp index 41bedaca..a7b67f64 100644 --- a/sysid-application/src/integrationtest-utils/native/cpp/IntegrationUtils.cpp +++ b/sysid-application/src/integrationtest-utils/native/cpp/IntegrationUtils.cpp @@ -7,10 +7,9 @@ #include #include +#include #include -#include "gtest/gtest.h" - void LaunchSim(std::string_view projectDirectory) { // Install the robot program. std::string installCmd = diff --git a/sysid-application/src/test/native/cpp/Main.cpp b/sysid-application/src/test/native/cpp/Main.cpp index 09072ee3..e993c1f1 100644 --- a/sysid-application/src/test/native/cpp/Main.cpp +++ b/sysid-application/src/test/native/cpp/Main.cpp @@ -2,7 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "gtest/gtest.h" +#include int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); diff --git a/sysid-application/src/test/native/cpp/analysis/AnalysisTypeTest.cpp b/sysid-application/src/test/native/cpp/analysis/AnalysisTypeTest.cpp index 8e93fe7c..0abb2a1e 100644 --- a/sysid-application/src/test/native/cpp/analysis/AnalysisTypeTest.cpp +++ b/sysid-application/src/test/native/cpp/analysis/AnalysisTypeTest.cpp @@ -2,7 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "gtest/gtest.h" +#include + #include "sysid/analysis/AnalysisType.h" TEST(AnalysisTypeTest, FromName) { diff --git a/sysid-application/src/test/native/cpp/analysis/FeedbackAnalysisTest.cpp b/sysid-application/src/test/native/cpp/analysis/FeedbackAnalysisTest.cpp index 45d17e4b..44f664c8 100644 --- a/sysid-application/src/test/native/cpp/analysis/FeedbackAnalysisTest.cpp +++ b/sysid-application/src/test/native/cpp/analysis/FeedbackAnalysisTest.cpp @@ -2,7 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "gtest/gtest.h" +#include + #include "sysid/analysis/FeedbackAnalysis.h" #include "sysid/analysis/FeedbackControllerPreset.h" diff --git a/sysid-application/src/test/native/cpp/analysis/FeedforwardAnalysisTest.cpp b/sysid-application/src/test/native/cpp/analysis/FeedforwardAnalysisTest.cpp index baab3d08..a52840d6 100644 --- a/sysid-application/src/test/native/cpp/analysis/FeedforwardAnalysisTest.cpp +++ b/sysid-application/src/test/native/cpp/analysis/FeedforwardAnalysisTest.cpp @@ -4,10 +4,10 @@ #include +#include #include #include -#include "gtest/gtest.h" #include "sysid/analysis/AnalysisManager.h" #include "sysid/analysis/ArmSim.h" #include "sysid/analysis/ElevatorSim.h" diff --git a/sysid-application/src/test/native/cpp/analysis/FilterTest.cpp b/sysid-application/src/test/native/cpp/analysis/FilterTest.cpp index eba393ee..a7b03492 100644 --- a/sysid-application/src/test/native/cpp/analysis/FilterTest.cpp +++ b/sysid-application/src/test/native/cpp/analysis/FilterTest.cpp @@ -6,7 +6,8 @@ #include #include -#include "gtest/gtest.h" +#include + #include "sysid/analysis/AnalysisManager.h" #include "sysid/analysis/FeedforwardAnalysis.h" #include "sysid/analysis/FilteringUtils.h" diff --git a/sysid-application/src/test/native/cpp/analysis/OLSTest.cpp b/sysid-application/src/test/native/cpp/analysis/OLSTest.cpp index 38e4e00d..439b2cc7 100644 --- a/sysid-application/src/test/native/cpp/analysis/OLSTest.cpp +++ b/sysid-application/src/test/native/cpp/analysis/OLSTest.cpp @@ -4,7 +4,8 @@ #include -#include "gtest/gtest.h" +#include + #include "sysid/analysis/OLS.h" TEST(OLSTest, TwoVariablesTwoPoints) { diff --git a/sysid-application/src/test/native/cpp/analysis/TrackWidthAnalysisTest.cpp b/sysid-application/src/test/native/cpp/analysis/TrackWidthAnalysisTest.cpp index 77fa925d..e7b662fe 100644 --- a/sysid-application/src/test/native/cpp/analysis/TrackWidthAnalysisTest.cpp +++ b/sysid-application/src/test/native/cpp/analysis/TrackWidthAnalysisTest.cpp @@ -2,7 +2,8 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. -#include "gtest/gtest.h" +#include + #include "sysid/analysis/TrackWidthAnalysis.h" TEST(TrackWidthAnalysisTest, Calculate) { diff --git a/sysid-application/src/test/native/cpp/deploy/DeployJSONTest.cpp b/sysid-application/src/test/native/cpp/deploy/DeployJSONTest.cpp index eaec36f6..2195a3a7 100644 --- a/sysid-application/src/test/native/cpp/deploy/DeployJSONTest.cpp +++ b/sysid-application/src/test/native/cpp/deploy/DeployJSONTest.cpp @@ -2,10 +2,10 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include #include #include -#include "gtest/gtest.h" #include "sysid/deploy/DeploySession.h" #include "sysid/generation/ConfigManager.h" diff --git a/sysid-application/src/test/native/cpp/generation/HardwareTypeTest.cpp b/sysid-application/src/test/native/cpp/generation/HardwareTypeTest.cpp index 9e6e7eae..a24b89f4 100644 --- a/sysid-application/src/test/native/cpp/generation/HardwareTypeTest.cpp +++ b/sysid-application/src/test/native/cpp/generation/HardwareTypeTest.cpp @@ -7,7 +7,8 @@ #include #include -#include "gtest/gtest.h" +#include + #include "sysid/generation/HardwareType.h" /**