Fix clangd #include warnings (#8565)

2026-06-22 01:11:42 +00:00 · 2026-02-11 11:15:02 -08:00
parent 1680e676b6
commit 245186cb15
70 changed files with 30 additions and 126 deletions
--- a/wpilibc/src/test/native/cpp/AlertTest.cpp
+++ b/wpilibc/src/test/native/cpp/AlertTest.cpp
@@ -5,8 +5,6 @@
 #include "wpi/util/Alert.hpp"

 #include <algorithm>
-#include <chrono>
-#include <map>
 #include <string>
 #include <utility>
 #include <vector>
--- a/wpilibc/src/test/native/cpp/AnalogPotentiometerTest.cpp
+++ b/wpilibc/src/test/native/cpp/AnalogPotentiometerTest.cpp
@@ -6,7 +6,7 @@

 #include <gtest/gtest.h>

-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/simulation/AnalogInputSim.hpp"
 #include "wpi/simulation/RoboRioSim.hpp"

--- a/wpilibc/src/test/native/cpp/DoubleSolenoidTestCTRE.cpp
+++ b/wpilibc/src/test/native/cpp/DoubleSolenoidTestCTRE.cpp
@@ -4,7 +4,6 @@

 #include <gtest/gtest.h>

-#include "wpi/hal/HAL.h"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
 #include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
 #include "wpi/hardware/pneumatic/Solenoid.hpp"
--- a/wpilibc/src/test/native/cpp/DoubleSolenoidTestREV.cpp
+++ b/wpilibc/src/test/native/cpp/DoubleSolenoidTestREV.cpp
@@ -4,7 +4,6 @@

 #include <gtest/gtest.h>

-#include "wpi/hal/HAL.h"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
 #include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
 #include "wpi/hardware/pneumatic/Solenoid.hpp"
--- a/wpilibc/src/test/native/cpp/SolenoidTestCTRE.cpp
+++ b/wpilibc/src/test/native/cpp/SolenoidTestCTRE.cpp
@@ -4,9 +4,7 @@

 #include <gtest/gtest.h>

-#include "wpi/hal/HAL.h"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
-#include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
 #include "wpi/hardware/pneumatic/Solenoid.hpp"

 namespace wpi {
--- a/wpilibc/src/test/native/cpp/SolenoidTestREV.cpp
+++ b/wpilibc/src/test/native/cpp/SolenoidTestREV.cpp
@@ -4,9 +4,7 @@

 #include <gtest/gtest.h>

-#include "wpi/hal/HAL.h"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
-#include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
 #include "wpi/hardware/pneumatic/Solenoid.hpp"

 namespace wpi {
--- a/wpilibc/src/test/native/cpp/event/BooleanEventTest.cpp
+++ b/wpilibc/src/test/native/cpp/event/BooleanEventTest.cpp
@@ -4,8 +4,6 @@

 #include "wpi/event/BooleanEvent.hpp"

-#include <atomic>
-
 #include <gtest/gtest.h>

 #include "wpi/event/EventLoop.hpp"
--- a/wpilibc/src/test/native/cpp/simulation/AddressableLEDSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/AddressableLEDSimTest.cpp
@@ -9,7 +9,7 @@
 #include <gtest/gtest.h>

 #include "callback_helpers/TestCallbackHelpers.hpp"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/hardware/led/AddressableLED.hpp"

 namespace wpi::sim {
--- a/wpilibc/src/test/native/cpp/simulation/AnalogEncoderSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/AnalogEncoderSimTest.cpp
@@ -4,17 +4,10 @@

 #include "wpi/simulation/AnalogEncoderSim.hpp"

-#include <numbers>
-
 #include <gtest/gtest.h>

-#include "wpi/hal/HAL.h"
 #include "wpi/hardware/discrete/AnalogInput.hpp"
 #include "wpi/hardware/rotation/AnalogEncoder.hpp"
-#include "wpi/units/math.hpp"
-
-#define EXPECT_NEAR_UNITS(val1, val2, eps) \
-  EXPECT_LE(wpi::units::math::abs(val1 - val2), eps)

 TEST(AnalogEncoderSimTest, Basic) {
  wpi::AnalogInput ai(0);
--- a/wpilibc/src/test/native/cpp/simulation/AnalogInputSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/AnalogInputSimTest.cpp
@@ -7,7 +7,7 @@
 #include <gtest/gtest.h>

 #include "callback_helpers/TestCallbackHelpers.hpp"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/hardware/discrete/AnalogInput.hpp"

 namespace wpi::sim {
--- a/wpilibc/src/test/native/cpp/simulation/CTREPCMSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/CTREPCMSimTest.cpp
@@ -7,7 +7,6 @@
 #include <gtest/gtest.h>

 #include "callback_helpers/TestCallbackHelpers.hpp"
-#include "wpi/hal/HAL.h"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
 #include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"

--- a/wpilibc/src/test/native/cpp/simulation/DIOSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/DIOSimTest.cpp
@@ -7,7 +7,7 @@
 #include <gtest/gtest.h>

 #include "callback_helpers/TestCallbackHelpers.hpp"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/hardware/discrete/DigitalInput.hpp"
 #include "wpi/hardware/discrete/DigitalOutput.hpp"

--- a/wpilibc/src/test/native/cpp/simulation/DigitalPWMSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/DigitalPWMSimTest.cpp
@@ -7,7 +7,7 @@
 #include <gtest/gtest.h>

 #include "callback_helpers/TestCallbackHelpers.hpp"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/hardware/discrete/DigitalOutput.hpp"

 namespace wpi::sim {
--- a/wpilibc/src/test/native/cpp/simulation/DriverStationSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/DriverStationSimTest.cpp
@@ -4,16 +4,12 @@

 #include "wpi/simulation/DriverStationSim.hpp"

-#include <string>
-#include <tuple>
-
 #include <gtest/gtest.h>

 #include "callback_helpers/TestCallbackHelpers.hpp"
 #include "wpi/driverstation/DriverStation.hpp"
-#include "wpi/driverstation/Joystick.hpp"
 #include "wpi/hal/DriverStationTypes.h"
-#include "wpi/simulation/SimHooks.hpp"
+#include "wpi/hal/HALBase.h"

 using namespace wpi;
 using namespace wpi::sim;
--- a/wpilibc/src/test/native/cpp/simulation/DutyCycleEncoderSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/DutyCycleEncoderSimTest.cpp
@@ -6,8 +6,7 @@

 #include <gtest/gtest.h>

-#include "callback_helpers/TestCallbackHelpers.hpp"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/hardware/rotation/DutyCycleEncoder.hpp"

 namespace wpi::sim {
--- a/wpilibc/src/test/native/cpp/simulation/DutyCycleSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/DutyCycleSimTest.cpp
@@ -7,8 +7,7 @@
 #include <gtest/gtest.h>

 #include "callback_helpers/TestCallbackHelpers.hpp"
-#include "wpi/hal/HAL.h"
-#include "wpi/hardware/discrete/DigitalInput.hpp"
+#include "wpi/hal/HALBase.h"
 #include "wpi/hardware/rotation/DutyCycle.hpp"

 namespace wpi::sim {
--- a/wpilibc/src/test/native/cpp/simulation/ElevatorSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/ElevatorSimTest.cpp
@@ -11,7 +11,6 @@
 #include "wpi/math/controller/PIDController.hpp"
 #include "wpi/math/system/DCMotor.hpp"
 #include "wpi/math/system/Models.hpp"
-#include "wpi/math/system/NumericalIntegration.hpp"
 #include "wpi/simulation/EncoderSim.hpp"
 #include "wpi/system/RobotController.hpp"
 #include "wpi/units/math.hpp"
--- a/wpilibc/src/test/native/cpp/simulation/EncoderSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/EncoderSimTest.cpp
@@ -7,7 +7,7 @@
 #include <gtest/gtest.h>

 #include "callback_helpers/TestCallbackHelpers.hpp"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/hardware/rotation/Encoder.hpp"
 #include "wpi/util/deprecated.hpp"

--- a/wpilibc/src/test/native/cpp/simulation/PWMMotorControlllerSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/PWMMotorControlllerSimTest.cpp
@@ -8,7 +8,6 @@

 #include <gtest/gtest.h>

-#include "wpi/hal/HAL.h"
 #include "wpi/hardware/motor/Spark.hpp"

 namespace wpi::sim {
--- a/wpilibc/src/test/native/cpp/simulation/PWMSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/PWMSimTest.cpp
@@ -7,7 +7,7 @@
 #include <gtest/gtest.h>

 #include "callback_helpers/TestCallbackHelpers.hpp"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/hardware/discrete/PWM.hpp"

 namespace wpi::sim {
--- a/wpilibc/src/test/native/cpp/simulation/PowerDistributionSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/PowerDistributionSimTest.cpp
@@ -9,7 +9,8 @@
 #include <gtest/gtest.h>

 #include "callback_helpers/TestCallbackHelpers.hpp"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/Ports.h"
 #include "wpi/hardware/power/PowerDistribution.hpp"

 namespace wpi::sim {
--- a/wpilibc/src/test/native/cpp/simulation/REVPHSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/REVPHSimTest.cpp
@@ -7,7 +7,6 @@
 #include <gtest/gtest.h>

 #include "callback_helpers/TestCallbackHelpers.hpp"
-#include "wpi/hal/HAL.h"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
 #include "wpi/hardware/pneumatic/PneumaticHub.hpp"

--- a/wpilibc/src/test/native/cpp/simulation/RoboRioSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/RoboRioSimTest.cpp
@@ -9,8 +9,6 @@
 #include <gtest/gtest.h>

 #include "callback_helpers/TestCallbackHelpers.hpp"
-#include "wpi/hal/HAL.h"
-#include "wpi/hal/HALBase.h"
 #include "wpi/system/RobotController.hpp"

 namespace wpi::sim {
--- a/wpilibc/src/test/native/cpp/simulation/SimInitializationTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/SimInitializationTest.cpp
@@ -2,11 +2,11 @@
 // 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 <exception>
+#include <stdexcept>

 #include <gtest/gtest.h>

-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/simulation/AddressableLEDSim.hpp"
 #include "wpi/simulation/AnalogInputSim.hpp"
 #include "wpi/simulation/CTREPCMSim.hpp"
--- a/wpilibc/src/test/native/cpp/simulation/StateSpaceSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/StateSpaceSimTest.cpp
@@ -10,12 +10,8 @@
 #include "wpi/math/controller/SimpleMotorFeedforward.hpp"
 #include "wpi/math/system/Models.hpp"
 #include "wpi/simulation/BatterySim.hpp"
-#include "wpi/simulation/DifferentialDrivetrainSim.hpp"
-#include "wpi/simulation/ElevatorSim.hpp"
 #include "wpi/simulation/EncoderSim.hpp"
 #include "wpi/simulation/FlywheelSim.hpp"
-#include "wpi/simulation/LinearSystemSim.hpp"
-#include "wpi/simulation/PWMSim.hpp"
 #include "wpi/simulation/RoboRioSim.hpp"
 #include "wpi/system/RobotController.hpp"
 #include "wpi/units/angular_acceleration.hpp"
--- a/wpilibc/src/test/native/cpp/smartdashboard/SendableChooserTest.cpp
+++ b/wpilibc/src/test/native/cpp/smartdashboard/SendableChooserTest.cpp
@@ -9,8 +9,6 @@
 #include <fmt/format.h>
 #include <gtest/gtest.h>

-#include "wpi/nt/NetworkTableInstance.hpp"
-#include "wpi/nt/StringTopic.hpp"
 #include "wpi/simulation/SendableChooserSim.hpp"
 #include "wpi/smartdashboard/SmartDashboard.hpp"