Merge wpiformat configs (#8365)

After replacing the remaining include guards with `#pragma once`, I was
able to merge all the wpiformat configs into one file in the repo root.
This should make the config easier to reason about and maintain in the
future.
This commit is contained in:
Tyler Veness
2025-11-11 22:00:42 -08:00
committed by GitHub
parent 23906ee2f7
commit 7a04d6a6a2
117 changed files with 182 additions and 873 deletions

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_BASE64_HPP_
#define WPIUTIL_WPI_UTIL_BASE64_HPP_
#pragma once
#include <stdint.h>
@@ -14,6 +13,7 @@
#include <vector>
namespace wpi::util {
template <typename T>
class SmallVectorImpl;
class raw_ostream;
@@ -45,5 +45,3 @@ std::string_view Base64Encode(std::span<const uint8_t> plain,
SmallVectorImpl<char>& buf);
} // namespace wpi::util
#endif // WPIUTIL_WPI_UTIL_BASE64_HPP_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_CALLBACKMANAGER_HPP_
#define WPIUTIL_WPI_UTIL_CALLBACKMANAGER_HPP_
#pragma once
#include <atomic>
#include <climits>
@@ -391,5 +390,3 @@ class CallbackManager {
};
} // namespace wpi::util
#endif // WPIUTIL_WPI_UTIL_CALLBACKMANAGER_HPP_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_DEMANGLE_HPP_
#define WPIUTIL_WPI_UTIL_DEMANGLE_HPP_
#pragma once
#include <string>
#include <string_view>
@@ -29,5 +28,3 @@ std::string GetTypeName(const T& type) {
}
} // namespace wpi::util
#endif // WPIUTIL_WPI_UTIL_DEMANGLE_HPP_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_LOGGER_HPP_
#define WPIUTIL_WPI_UTIL_LOGGER_HPP_
#pragma once
#include <functional>
#include <utility>
@@ -90,5 +89,3 @@ class Logger {
WPI_LOG(inst, ::wpi::util::WPI_LOG_DEBUG4, format __VA_OPT__(, ) __VA_ARGS__)
} // namespace wpi::util
#endif // WPIUTIL_WPI_UTIL_LOGGER_HPP_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_RAWFRAME_H_
#define WPIUTIL_WPI_UTIL_RAWFRAME_H_
#pragma once
#include <stdint.h>
@@ -162,5 +161,3 @@ void SetFrameData(JNIEnv* env, jclass rawFrameCls, jobject jframe,
} // namespace wpi::util
#endif
#endif // WPIUTIL_WPI_UTIL_RAWFRAME_H_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_SAFETHREAD_HPP_
#define WPIUTIL_WPI_UTIL_SAFETHREAD_HPP_
#pragma once
#include <atomic>
#include <memory>
@@ -141,5 +140,3 @@ class SafeThreadOwner : public detail::SafeThreadOwnerBase {
};
} // namespace wpi::util
#endif // WPIUTIL_WPI_UTIL_SAFETHREAD_HPP_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_STACKTRACE_HPP_
#define WPIUTIL_WPI_UTIL_STACKTRACE_HPP_
#pragma once
#include <string>
@@ -31,5 +30,3 @@ std::string GetStackTraceDefault(int offset);
void SetGetStackTraceImpl(std::string (*func)(int offset));
} // namespace wpi::util
#endif // WPIUTIL_WPI_UTIL_STACKTRACE_HPP_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_UIDVECTOR_HPP_
#define WPIUTIL_WPI_UTIL_UIDVECTOR_HPP_
#pragma once
#include <iterator>
#include <utility>
@@ -155,5 +154,3 @@ class UidVector {
};
} // namespace wpi::util
#endif // WPIUTIL_WPI_UTIL_UIDVECTOR_HPP_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_DEPRECATED_HPP_
#define WPIUTIL_WPI_UTIL_DEPRECATED_HPP_
#pragma once
#ifndef WPI_IGNORE_DEPRECATED
#ifdef __GNUC__
@@ -27,5 +26,3 @@
#define WPI_UNIGNORE_DEPRECATED
#endif
#endif
#endif // WPIUTIL_WPI_UTIL_DEPRECATED_HPP_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_FMT_RAW_OSTREAM_HPP_
#define WPIUTIL_WPI_UTIL_FMT_RAW_OSTREAM_HPP_
#pragma once
#include <fmt/format.h>
@@ -27,5 +26,3 @@ void print(wpi::util::raw_ostream& os, const S& format_str, Args&&... args) {
}
} // namespace wpi::util
#endif // WPIUTIL_WPI_UTIL_FMT_RAW_OSTREAM_HPP_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_FUTURE_HPP_
#define WPIUTIL_WPI_UTIL_FUTURE_HPP_
#pragma once
#include <stdint.h>
@@ -939,5 +938,3 @@ future<void> detail::FutureThen<void, void>::Create(
}
} // namespace wpi::util
#endif // WPIUTIL_WPI_UTIL_FUTURE_HPP_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_JNI_UTIL_HPP_
#define WPIUTIL_WPI_UTIL_JNI_UTIL_HPP_
#pragma once
#include <jni.h>
@@ -978,5 +977,3 @@ struct JExceptionInit {
};
} // namespace wpi::util::java
#endif // WPIUTIL_WPI_UTIL_JNI_UTIL_HPP_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_NODISCARD_H_
#define WPIUTIL_WPI_UTIL_NODISCARD_H_
#pragma once
// This should only be used on APIs that can be compiled as C or C++. If the API
// is C++ only, use [[nodiscard]] instead.
@@ -17,5 +16,3 @@
#endif
#endif
#endif // WPIUTIL_WPI_UTIL_NODISCARD_H_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_PRIORITY_QUEUE_HPP_
#define WPIUTIL_WPI_UTIL_PRIORITY_QUEUE_HPP_
#pragma once
#include <algorithm>
#include <concepts>
@@ -112,5 +111,3 @@ class priority_queue {
};
} // namespace wpi::util
#endif // WPIUTIL_WPI_UTIL_PRIORITY_QUEUE_HPP_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_RAW_ISTREAM_HPP_
#define WPIUTIL_WPI_UTIL_RAW_ISTREAM_HPP_
#pragma once
#include <stdint.h>
@@ -172,5 +171,3 @@ class raw_fd_istream : public raw_istream {
};
} // namespace wpi::util
#endif // WPIUTIL_WPI_UTIL_RAW_ISTREAM_HPP_

View File

@@ -17,8 +17,7 @@
-- Eugene Hopkinson <slowriot at voxelstorm dot com>
*/
#ifndef WPIUTIL_WPI_UTIL_SHA1_HPP_
#define WPIUTIL_WPI_UTIL_SHA1_HPP_
#pragma once
#include <stdint.h>
@@ -48,5 +47,3 @@ class SHA1 {
};
} // namespace wpi::util
#endif // WPIUTIL_WPI_UTIL_SHA1_HPP_

View File

@@ -2,8 +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.
#ifndef WPIUTIL_WPI_UTIL_TIMESTAMP_H_
#define WPIUTIL_WPI_UTIL_TIMESTAMP_H_
#pragma once
#include <stdint.h>
@@ -85,5 +84,3 @@ uint64_t GetSystemTime();
} // namespace wpi::util
#endif
#endif // WPIUTIL_WPI_UTIL_TIMESTAMP_H_