Classify other libraries' headers properly and fix committed formatting issues (#620)

wpilibc/src/main/native/include/AnalogGyro.h

@@ -9,8 +9,9 @@
 
 #include <memory>
 
+#include <HAL/Types.h>
+
 #include "GyroBase.h"
-#include "HAL/Types.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/AnalogInput.h

@@ -12,7 +12,8 @@
 #include <memory>
 #include <string>
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "PIDSource.h"
 #include "SensorBase.h"

wpilibc/src/main/native/include/AnalogOutput.h

@@ -10,7 +10,8 @@
 #include <memory>
 #include <string>
 
-#include "HAL/AnalogOutput.h"
+#include <HAL/AnalogOutput.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 

wpilibc/src/main/native/include/AnalogTrigger.h

@@ -9,8 +9,9 @@
 
 #include <memory>
 
+#include <HAL/Types.h>
+
 #include "AnalogTriggerOutput.h"
-#include "HAL/Types.h"
 #include "SensorBase.h"
 
 namespace frc {

wpilibc/src/main/native/include/AnalogTriggerOutput.h

@@ -7,8 +7,9 @@
 
 #pragma once
 
+#include <HAL/AnalogTrigger.h>
+
 #include "DigitalSource.h"
-#include "HAL/AnalogTrigger.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/Base.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "HAL/cpp/make_unique.h"
+#include <HAL/cpp/make_unique.h>
 
 // MSVC 2013 doesn't allow "= default" on move constructors, but since we are
 // (currently) only actually using the move constructors in non-MSVC situations

wpilibc/src/main/native/include/CameraServer.h

@@ -15,11 +15,12 @@
 #include <string>
 #include <vector>
 
+#include <llvm/DenseMap.h>
+#include <llvm/StringMap.h>
+#include <llvm/StringRef.h>
+
 #include "ErrorBase.h"
 #include "cscore.h"
-#include "llvm/DenseMap.h"
-#include "llvm/StringMap.h"
-#include "llvm/StringRef.h"
 #include "networktables/NetworkTable.h"
 
 namespace frc {

wpilibc/src/main/native/include/Commands/Scheduler.h

@@ -14,9 +14,10 @@
 #include <string>
 #include <vector>
 
+#include <HAL/cpp/priority_mutex.h>
+
 #include "Commands/Command.h"
 #include "ErrorBase.h"
-#include "HAL/cpp/priority_mutex.h"
 #include "SmartDashboard/NamedSendable.h"
 #include "SmartDashboard/SmartDashboard.h"
 #include "networktables/NetworkTable.h"

wpilibc/src/main/native/include/Compressor.h

@@ -10,7 +10,8 @@
 #include <memory>
 #include <string>
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 #include "tables/ITableListener.h"

wpilibc/src/main/native/include/Counter.h

@@ -10,10 +10,11 @@
 #include <memory>
 #include <string>
 
+#include <HAL/Counter.h>
+#include <HAL/Types.h>
+
 #include "AnalogTrigger.h"
 #include "CounterBase.h"
-#include "HAL/Counter.h"
-#include "HAL/Types.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 

wpilibc/src/main/native/include/DigitalGlitchFilter.h

@@ -11,8 +11,9 @@
 
 #include <array>
 
+#include <HAL/cpp/priority_mutex.h>
+
 #include "DigitalSource.h"
-#include "HAL/cpp/priority_mutex.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/DigitalOutput.h

@@ -10,8 +10,9 @@
 #include <memory>
 #include <string>
 
+#include <HAL/Types.h>
+
 #include "DigitalSource.h"
-#include "HAL/Types.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "tables/ITableListener.h"
 

wpilibc/src/main/native/include/DigitalSource.h

@@ -7,7 +7,8 @@
 
 #pragma once
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+
 #include "InterruptableSensorBase.h"
 
 namespace frc {

wpilibc/src/main/native/include/DoubleSolenoid.h

@@ -10,7 +10,8 @@
 #include <memory>
 #include <string>
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SolenoidBase.h"
 #include "tables/ITableListener.h"

wpilibc/src/main/native/include/DriverStation.h

@@ -12,11 +12,12 @@
 #include <string>
 #include <thread>
 
-#include "HAL/DriverStation.h"
-#include "HAL/cpp/priority_mutex.h"
+#include <HAL/DriverStation.h>
+#include <HAL/cpp/priority_mutex.h>
+#include <llvm/StringRef.h>
+
 #include "RobotState.h"
 #include "SensorBase.h"
-#include "llvm/StringRef.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/Encoder.h

@@ -10,9 +10,10 @@
 #include <memory>
 #include <string>
 
+#include <HAL/Encoder.h>
+
 #include "Counter.h"
 #include "CounterBase.h"
-#include "HAL/Encoder.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "PIDSource.h"
 #include "SensorBase.h"

wpilibc/src/main/native/include/Error.h

@@ -11,8 +11,7 @@
 
 #include <string>
 
-#include "Base.h"
-#include "llvm/StringRef.h"
+#include <llvm/StringRef.h>
 
 #ifdef _WIN32
 #include <Windows.h>
@@ -20,6 +19,8 @@
 #undef GetMessage
 #endif
 
+#include "Base.h"
+
 namespace frc {
 
 //  Forward declarations

wpilibc/src/main/native/include/ErrorBase.h

@@ -7,10 +7,11 @@
 
 #pragma once
 
+#include <HAL/cpp/priority_mutex.h>
+#include <llvm/StringRef.h>
+
 #include "Base.h"
 #include "Error.h"
-#include "HAL/cpp/priority_mutex.h"
-#include "llvm/StringRef.h"
 
 #define wpi_setErrnoErrorWithContext(context) \
   this->SetErrnoError((context), __FILE__, __FUNCTION__, __LINE__)

wpilibc/src/main/native/include/InterruptableSensorBase.h

@@ -7,8 +7,9 @@
 
 #pragma once
 
+#include <HAL/Interrupts.h>
+
 #include "AnalogTriggerType.h"
-#include "HAL/Interrupts.h"
 #include "SensorBase.h"
 
 namespace frc {

wpilibc/src/main/native/include/MotorSafety.h

@@ -9,7 +9,7 @@
 
 #define DEFAULT_SAFETY_EXPIRATION 0.1
 
-#include "llvm/raw_ostream.h"
+#include <llvm/raw_ostream.h>
 
 namespace frc {
 

wpilibc/src/main/native/include/MotorSafetyHelper.h

@@ -9,8 +9,9 @@
 
 #include <set>
 
+#include <HAL/cpp/priority_mutex.h>
+
 #include "ErrorBase.h"
-#include "HAL/cpp/priority_mutex.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/Notifier.h

@@ -13,9 +13,10 @@
 #include <functional>
 #include <utility>
 
+#include <HAL/Notifier.h>
+#include <HAL/cpp/priority_mutex.h>
+
 #include "ErrorBase.h"
-#include "HAL/Notifier.h"
-#include "HAL/cpp/priority_mutex.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/PIDController.h

@@ -12,9 +12,10 @@
 #include <queue>
 #include <string>
 
+#include <HAL/cpp/priority_mutex.h>
+
 #include "Base.h"
 #include "Controller.h"
-#include "HAL/cpp/priority_mutex.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Notifier.h"
 #include "PIDInterface.h"

wpilibc/src/main/native/include/PWM.h

@@ -12,7 +12,8 @@
 #include <memory>
 #include <string>
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 #include "tables/ITableListener.h"

wpilibc/src/main/native/include/Relay.h

@@ -10,11 +10,12 @@
 #include <memory>
 #include <string>
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+#include <llvm/raw_ostream.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "MotorSafety.h"
 #include "SensorBase.h"
-#include "llvm/raw_ostream.h"
 #include "tables/ITable.h"
 #include "tables/ITableListener.h"
 

wpilibc/src/main/native/include/Resource.h

@@ -13,8 +13,9 @@
 #include <string>
 #include <vector>
 
+#include <HAL/cpp/priority_mutex.h>
+
 #include "ErrorBase.h"
-#include "HAL/cpp/priority_mutex.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/RobotBase.h

@@ -9,9 +9,10 @@
 
 #include <thread>
 
+#include <HAL/HAL.h>
+#include <llvm/raw_ostream.h>
+
 #include "Base.h"
-#include "HAL/HAL.h"
-#include "llvm/raw_ostream.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/RobotDrive.h

@@ -9,10 +9,11 @@
 
 #include <memory>
 
+#include <llvm/raw_ostream.h>
+
 #include "ErrorBase.h"
 #include "MotorSafety.h"
 #include "MotorSafetyHelper.h"
-#include "llvm/raw_ostream.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/SafePWM.h

@@ -9,10 +9,11 @@
 
 #include <memory>
 
+#include <llvm/raw_ostream.h>
+
 #include "MotorSafety.h"
 #include "MotorSafetyHelper.h"
 #include "PWM.h"
-#include "llvm/raw_ostream.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/SerialPort.h

@@ -9,8 +9,9 @@
 
 #include <string>
 
+#include <llvm/StringRef.h>
+
 #include "ErrorBase.h"
-#include "llvm/StringRef.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/SmartDashboard/SendableChooser.h

@@ -10,9 +10,10 @@
 #include <memory>
 #include <string>
 
+#include <llvm/StringMap.h>
+#include <llvm/StringRef.h>
+
 #include "SmartDashboard/SendableChooserBase.h"
-#include "llvm/StringMap.h"
-#include "llvm/StringRef.h"
 #include "tables/ITable.h"
 
 namespace frc {

wpilibc/src/main/native/include/Solenoid.h

@@ -10,7 +10,8 @@
 #include <memory>
 #include <string>
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SolenoidBase.h"
 #include "tables/ITableListener.h"

wpilibc/src/main/native/include/Timer.h

@@ -7,8 +7,9 @@
 
 #pragma once
 
+#include <HAL/cpp/priority_mutex.h>
+
 #include "Base.h"
-#include "HAL/cpp/priority_mutex.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/Utility.h

@@ -15,7 +15,7 @@
 
 #include <string>
 
-#include "llvm/StringRef.h"
+#include <llvm/StringRef.h>
 
 #define wpi_assert(condition) \
   wpi_assert_impl(condition, #condition, "", __FILE__, __LINE__, __FUNCTION__)