Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-04 03:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use C++23 std::expected (#8823)

Browse Source
This commit is contained in:
Gold856
2026-07-02 02:10:52 -04:00
committed by GitHub
parent 1299abc173
commit 4e7dd4cfbb
37 changed files with 133 additions and 2709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hal/src/main/native/include/wpi/hal/handles/DigitalHandleResource.hpp
View File

@@ -7,6 +7,7 @@
#include <stdint.h>
#include <array>
#include <expected>
#include <memory>
#include <string_view>
#include <utility>
@@ -15,7 +16,6 @@
#include "wpi/hal/Errors.h"
#include "wpi/hal/Types.h"
#include "wpi/hal/handles/HandlesInternal.hpp"
#include "wpi/util/expected"
#include "wpi/util/mutex.hpp"
namespace wpi::hal {
@@ -41,7 +41,7 @@ class DigitalHandleResource : public HandleBase {
DigitalHandleResource(const DigitalHandleResource&) = delete;
DigitalHandleResource& operator=(const DigitalHandleResource&) = delete;
wpi::util::expected<std::pair<THandle, std::shared_ptr<TStruct>>, HAL_Status>
std::expected<std::pair<THandle, std::shared_ptr<TStruct>>, HAL_Status>
Allocate(int16_t index, HAL_HandleEnum enumValue, std::string_view name);
int16_t GetIndex(THandle handle, HAL_HandleEnum enumValue) {
return getHandleTypedIndex(handle, enumValue, m_version);
@@ -56,23 +56,23 @@ class DigitalHandleResource : public HandleBase {
};
template <typename THandle, typename TStruct, int16_t size>
wpi::util::expected<std::pair<THandle, std::shared_ptr<TStruct>>, HAL_Status>
std::expected<std::pair<THandle, std::shared_ptr<TStruct>>, HAL_Status>
DigitalHandleResource<THandle, TStruct, size>::Allocate(
int16_t index, HAL_HandleEnum enumValue, std::string_view name) {
// don't acquire the lock if we can fail early.
if (index < 0 || index >= size) {
return wpi::util::unexpected(MakeErrorIndexOutOfRange(
HAL_RESOURCE_OUT_OF_RANGE, name, 0, size, index));
return std::unexpected(MakeErrorIndexOutOfRange(HAL_RESOURCE_OUT_OF_RANGE,
name, 0, size, index));
}
std::scoped_lock lock(m_handleMutexes[index]);
// check for allocation, otherwise allocate and return a valid handle
if (m_structures[index] != nullptr) {
if constexpr (detail::HasPreviousAllocation<TStruct>) {
return wpi::util::unexpected(MakeErrorPreviouslyAllocated(
return std::unexpected(MakeErrorPreviouslyAllocated(
HAL_RESOURCE_IS_ALLOCATED, name, index,
m_structures[index]->previousAllocation));
} else {
return wpi::util::unexpected(MakeErrorPreviouslyAllocated(
return std::unexpected(MakeErrorPreviouslyAllocated(
HAL_RESOURCE_IS_ALLOCATED, name, index, "unknown"));
}
}

21
hal/src/main/native/include/wpi/hal/handles/IndexedClassedHandleResource.hpp
View File

@@ -7,13 +7,13 @@
#include <stdint.h>
#include <array>
#include <expected>
#include <memory>
#include "wpi/hal/ErrorHandling.hpp"
#include "wpi/hal/Errors.h"
#include "wpi/hal/Types.h"
#include "wpi/hal/handles/HandlesInternal.hpp"
#include "wpi/util/expected"
#include "wpi/util/mutex.hpp"
namespace wpi::hal {
@@ -42,9 +42,10 @@ class IndexedClassedHandleResource : public HandleBase {
IndexedClassedHandleResource& operator=(const IndexedClassedHandleResource&) =
delete;
wpi::util::expected<THandle, HAL_Status> Allocate(
int16_t index, std::shared_ptr<TStruct> toSet, std::string_view name,
int offset = 0);
std::expected<THandle, HAL_Status> Allocate(int16_t index,
std::shared_ptr<TStruct> toSet,
std::string_view name,
int offset = 0);
int16_t GetIndex(THandle handle) {
return getHandleTypedIndex(handle, enumValue, m_version);
}
@@ -59,25 +60,25 @@ class IndexedClassedHandleResource : public HandleBase {
template <typename THandle, typename TStruct, int16_t size,
HAL_HandleEnum enumValue>
wpi::util::expected<THandle, HAL_Status>
std::expected<THandle, HAL_Status>
IndexedClassedHandleResource<THandle, TStruct, size, enumValue>::Allocate(
int16_t index, std::shared_ptr<TStruct> toSet, std::string_view name,
int offset) {
// don't acquire the lock if we can fail early.
if (index < 0 || index >= size) {
return wpi::util::unexpected(
MakeErrorIndexOutOfRange(HAL_RESOURCE_OUT_OF_RANGE, name, offset,
size + offset, index + offset));
return std::unexpected(MakeErrorIndexOutOfRange(HAL_RESOURCE_OUT_OF_RANGE,
name, offset, size + offset,
index + offset));
}
std::scoped_lock lock(m_handleMutexes[index]);
// check for allocation, otherwise allocate and return a valid handle
if (m_structures[index] != nullptr) {
if constexpr (detail::HasPreviousAllocation<TStruct>) {
return wpi::util::unexpected(MakeErrorPreviouslyAllocated(
return std::unexpected(MakeErrorPreviouslyAllocated(
HAL_RESOURCE_IS_ALLOCATED, name, index + offset,
m_structures[index]->previousAllocation));
} else {
return wpi::util::unexpected(MakeErrorPreviouslyAllocated(
return std::unexpected(MakeErrorPreviouslyAllocated(
HAL_RESOURCE_IS_ALLOCATED, name, index + offset, "unknown"));
}
}

16
hal/src/main/native/include/wpi/hal/handles/IndexedHandleResource.hpp
View File

@@ -7,6 +7,7 @@
#include <stdint.h>
#include <array>
#include <expected>
#include <memory>
#include <string_view>
#include <utility>
@@ -15,7 +16,6 @@
#include "wpi/hal/Errors.h"
#include "wpi/hal/Types.h"
#include "wpi/hal/handles/HandlesInternal.hpp"
#include "wpi/util/expected"
#include "wpi/util/mutex.hpp"
namespace wpi::hal {
@@ -42,7 +42,7 @@ class IndexedHandleResource : public HandleBase {
IndexedHandleResource(const IndexedHandleResource&) = delete;
IndexedHandleResource& operator=(const IndexedHandleResource&) = delete;
wpi::util::expected<std::pair<THandle, std::shared_ptr<TStruct>>, HAL_Status>
std::expected<std::pair<THandle, std::shared_ptr<TStruct>>, HAL_Status>
Allocate(int16_t index, std::string_view name, int offset = 0);
int16_t GetIndex(THandle handle) {
return getHandleTypedIndex(handle, enumValue, m_version);
@@ -58,24 +58,24 @@ class IndexedHandleResource : public HandleBase {
template <typename THandle, typename TStruct, int16_t size,
HAL_HandleEnum enumValue>
wpi::util::expected<std::pair<THandle, std::shared_ptr<TStruct>>, HAL_Status>
std::expected<std::pair<THandle, std::shared_ptr<TStruct>>, HAL_Status>
IndexedHandleResource<THandle, TStruct, size, enumValue>::Allocate(
int16_t index, std::string_view name, int offset) {
// don't acquire the lock if we can fail early.
if (index < 0 || index >= size) {
return wpi::util::unexpected(
MakeErrorIndexOutOfRange(HAL_RESOURCE_OUT_OF_RANGE, name, offset,
size + offset, index + offset));
return std::unexpected(MakeErrorIndexOutOfRange(HAL_RESOURCE_OUT_OF_RANGE,
name, offset, size + offset,
index + offset));
}
std::scoped_lock lock(m_handleMutexes[index]);
// check for allocation, otherwise allocate and return a valid handle
if (m_structures[index] != nullptr) {
if constexpr (detail::HasPreviousAllocation<TStruct>) {
return wpi::util::unexpected(MakeErrorPreviouslyAllocated(
return std::unexpected(MakeErrorPreviouslyAllocated(
HAL_RESOURCE_IS_ALLOCATED, name, index + offset,
m_structures[index]->previousAllocation));
} else {
return wpi::util::unexpected(MakeErrorPreviouslyAllocated(
return std::unexpected(MakeErrorPreviouslyAllocated(
HAL_RESOURCE_IS_ALLOCATED, name, index + offset, "unknown"));
}
}