Skip to content

Commit 6e867c8

Browse files
committed
Merge branch 'main' into add-boost-outcome-dep
2 parents 2cfa5ae + 6aac241 commit 6e867c8

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

.gersemirc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# yamllint disable-line rule:line-length
22
# yaml-language-server: $schema=https://raw.githubusercontent.com/BlankSpruce/gersemi/master/gersemi/configuration.schema.json
33

4-
definitions: ["CMake/ystdlib-cpp-helpers.cmake"]
4+
definitions:
5+
- "CMake/ystdlib-cpp-helpers.cmake"
6+
- "build/deps/Catch2/Catch2-src/extras/Catch.cmake"
57
line_length: 100
68
list_expansion: "favour-expansion"

src/ystdlib/containers/Array.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef YSTDLIB_CONTAINERS_ARRAY
2-
#define YSTDLIB_CONTAINERS_ARRAY
1+
#ifndef YSTDLIB_CONTAINERS_ARRAY_HPP
2+
#define YSTDLIB_CONTAINERS_ARRAY_HPP
33

44
#include <algorithm>
55
#include <concepts>
@@ -119,4 +119,4 @@ class Array {
119119
};
120120
} // namespace ystdlib::containers
121121

122-
#endif // YSTDLIB_CONTAINERS_ARRAY
122+
#endif // YSTDLIB_CONTAINERS_ARRAY_HPP

src/ystdlib/error_handling/test/types.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,21 @@
55
#include <string_view>
66
#include <system_error>
77

8+
#include <ystdlib/error_handling/ErrorCode.hpp>
9+
810
#include "constants.hpp"
911

10-
using ystdlib::error_handling::test::AlwaysSuccessErrorCategory;
1112
using ystdlib::error_handling::test::AlwaysSuccessErrorCodeEnum;
12-
using ystdlib::error_handling::test::BinaryErrorCategory;
1313
using ystdlib::error_handling::test::BinaryErrorCodeEnum;
1414
using ystdlib::error_handling::test::cAlwaysSuccessErrorCategoryName;
1515
using ystdlib::error_handling::test::cBinaryTestErrorCategoryName;
1616
using ystdlib::error_handling::test::cFailureConditions;
1717
using ystdlib::error_handling::test::cFailureErrorMsg;
1818
using ystdlib::error_handling::test::cSuccessErrorMsg;
1919
using ystdlib::error_handling::test::cUnrecognizedErrorCode;
20+
using AlwaysSuccessErrorCategory
21+
= ystdlib::error_handling::ErrorCategory<AlwaysSuccessErrorCodeEnum>;
22+
using BinaryErrorCategory = ystdlib::error_handling::ErrorCategory<BinaryErrorCodeEnum>;
2023

2124
template <>
2225
auto AlwaysSuccessErrorCategory::name() const noexcept -> char const* {

src/ystdlib/error_handling/test/types.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ enum class BinaryErrorCodeEnum : uint8_t {
1616
};
1717

1818
using AlwaysSuccessErrorCode = ystdlib::error_handling::ErrorCode<AlwaysSuccessErrorCodeEnum>;
19-
using AlwaysSuccessErrorCategory
20-
= ystdlib::error_handling::ErrorCategory<AlwaysSuccessErrorCodeEnum>;
2119
using BinaryErrorCode = ystdlib::error_handling::ErrorCode<BinaryErrorCodeEnum>;
22-
using BinaryErrorCategory = ystdlib::error_handling::ErrorCategory<BinaryErrorCodeEnum>;
2320
} // namespace ystdlib::error_handling::test
2421

2522
YSTDLIB_ERROR_HANDLING_MARK_AS_ERROR_CODE_ENUM(

taskfiles/lint-cmake.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ tasks:
4242
- "FLAGS"
4343
dir: "{{.ROOT_DIR}}"
4444
deps:
45+
- ":deps:install-all" # Allow Gersemi to parse 3rdparty CMake modules for linting
4546
- "venv"
4647
cmds:
4748
- |-

0 commit comments

Comments
 (0)