Skip to content

Commit 9055638

Browse files
steve-downeysteve-downey
committed
Reformat after name length change
1 parent 1e58402 commit 9055638

File tree

11 files changed

+195
-199
lines changed

11 files changed

+195
-199
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@ if(OPTIONAL_ENABLE_TESTING)
4646
add_executable(beman_optional_test)
4747
target_sources(
4848
beman_optional_test
49-
PRIVATE
50-
FILE_SET beman_optional_test_headers
51-
TYPE HEADERS
52-
BASE_DIRS src
49+
PRIVATE FILE_SET beman_optional_test_headers TYPE HEADERS BASE_DIRS src
5350
)
5451

5552
add_subdirectory(src/beman/optional/tests)

‎examples/optional_ref.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ beman::optional::optional<Cat&> api() {
4646

4747
int main() {
4848
// Example from P2988R5: optional reference.
49-
[[maybe_unused]] Cat* old_cat = std17::api();
49+
[[maybe_unused]] Cat* old_cat = std17::api();
5050
[[maybe_unused]] beman::optional::optional<Cat&> new_cat = std26::api();
5151

5252
return 0;

‎examples/std_vs_beman.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
int main() {
1111
{
1212
// Empty optional example.
13-
std::optional<int> std_empty_opt;
13+
std::optional<int> std_empty_opt;
1414
beman::optional::optional<int> beman_empty_opt;
1515
assert(!std_empty_opt.has_value() &&
1616
!beman_empty_opt.has_value()); // or assert(!std_empty_opt && !beman_empty_opt);
@@ -20,7 +20,7 @@ int main() {
2020

2121
{
2222
// Optional with value example.
23-
std::optional<int> std_opt = 26;
23+
std::optional<int> std_opt = 26;
2424
beman::optional::optional<int> beman_opt = 26;
2525
assert(std_opt.has_value() && beman_opt.has_value()); // or assert(std_opt && beman_opt);
2626
assert(std_opt.value() == beman_opt.value()); // or assert(*std_opt == *beman_opt);

‎include/beman/optional/detail/stl_interfaces/iterator_interface.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ BEMAN_OPTIONAL_DETAIL_STL_INTERFACES_NAMESPACE_V1 {
280280
return retval;
281281
}
282282
friend BEMAN_OPTIONAL_DETAIL_STL_INTERFACES_HIDDEN_FRIEND_CONSTEXPR Derived operator+(difference_type i,
283-
Derived it) noexcept {
283+
Derived it) noexcept {
284284
return it + i;
285285
}
286286

@@ -970,16 +970,16 @@ BEMAN_OPTIONAL_DETAIL_STL_INTERFACES_NAMESPACE_V3 {
970970
#define BEMAN_OPTIONAL_DETAIL_STL_INTERFACES_STATIC_ASSERT_CONCEPT(iter, concept_name)
971971
#endif
972972

973-
#define BEMAN_OPTIONAL_DETAIL_STL_INTERFACES_STATIC_ASSERT_ITERATOR_TRAITS_IMPL( \
973+
#define BEMAN_OPTIONAL_DETAIL_STL_INTERFACES_STATIC_ASSERT_ITERATOR_TRAITS_IMPL( \
974974
iter, category, value_t, ref, ptr, diff_t) \
975975
static_assert(std::is_same<typename std::iterator_traits<iter>::value_type, value_t>::value, ""); \
976976
static_assert(std::is_same<typename std::iterator_traits<iter>::reference, ref>::value, ""); \
977977
static_assert(std::is_same<typename std::iterator_traits<iter>::pointer, ptr>::value, ""); \
978978
static_assert(std::is_same<typename std::iterator_traits<iter>::difference_type, diff_t>::value, "");
979979

980-
#define BEMAN_OPTIONAL_DETAIL_STL_INTERFACES_STATIC_ASSERT_ITERATOR_TRAITS( \
981-
iter, category, concept, value_type, reference, pointer, difference_type) \
982-
BEMAN_OPTIONAL_DETAIL_STL_INTERFACES_STATIC_ASSERT_ITERATOR_TRAITS_IMPL( \
980+
#define BEMAN_OPTIONAL_DETAIL_STL_INTERFACES_STATIC_ASSERT_ITERATOR_TRAITS( \
981+
iter, category, concept, value_type, reference, pointer, difference_type) \
982+
BEMAN_OPTIONAL_DETAIL_STL_INTERFACES_STATIC_ASSERT_ITERATOR_TRAITS_IMPL( \
983983
iter, category, value_type, reference, pointer, difference_type)
984984
#endif
985985

‎include/beman/optional/optional.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,8 +1436,7 @@ template <typename T>
14361436
}
14371437
struct hash<beman::optional::optional<T>> {
14381438
static_assert(!is_reference_v<T>, "hash is not enabled for reference types");
1439-
size_t operator()(const beman::optional::optional<T>& o) const
1440-
noexcept(noexcept(hash<remove_const_t<T>>{}(*o))) {
1439+
size_t operator()(const beman::optional::optional<T>& o) const noexcept(noexcept(hash<remove_const_t<T>>{}(*o))) {
14411440
if (o) {
14421441
return std::hash<std::remove_const_t<T>>{}(*o);
14431442
} else {

‎src/beman/optional/tests/optional.t.cpp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ TEST(OptionalTest, Constructors) {
2121
std::ignore = i1;
2222
std::ignore = i2;
2323

24-
int i = 0;
24+
int i = 0;
2525
beman::optional::optional<int> i3 = i;
26-
std::ignore = i3;
26+
std::ignore = i3;
2727

2828
using beman::optional::tests::empty;
2929

3030
beman::optional::optional<empty> e1;
3131
beman::optional::optional<int> e2{beman::optional::nullopt};
3232

33-
empty e{};
33+
empty e{};
3434
beman::optional::optional<empty> e3 = e;
35-
std::ignore = e1;
36-
std::ignore = e2;
37-
std::ignore = e3;
35+
std::ignore = e1;
36+
std::ignore = e2;
37+
std::ignore = e3;
3838
}
3939

4040
TEST(OptionalTest, Constructors2) {
@@ -74,7 +74,7 @@ TEST(OptionalTest, Constructors2) {
7474
}
7575

7676
{
77-
auto i = 42;
77+
auto i = 42;
7878
beman::optional::optional<int&> o = i;
7979
EXPECT_TRUE(o);
8080
EXPECT_TRUE(*o == 42);
@@ -100,8 +100,8 @@ TEST(OptionalTest, Constructors3) {
100100
using beman::optional::tests::base;
101101
using beman::optional::tests::derived;
102102

103-
base b{1};
104-
derived d(1, 2);
103+
base b{1};
104+
derived d(1, 2);
105105
beman::optional::optional<base> b1{b};
106106
beman::optional::optional<base> b2{d};
107107

@@ -113,7 +113,7 @@ TEST(OptionalTest, Constructors3) {
113113
TEST(OptionalTest, NonDefaultConstruct) {
114114
using beman::optional::tests::int_ctor;
115115

116-
int_ctor i = 7;
116+
int_ctor i = 7;
117117
beman::optional::optional<int_ctor> v1{};
118118
beman::optional::optional<int_ctor> v2{i};
119119
std::ignore = v1;
@@ -122,7 +122,7 @@ TEST(OptionalTest, NonDefaultConstruct) {
122122

123123
TEST(OptionalTest, OptionalOfOptional) {
124124
using O = beman::optional::optional<int>;
125-
O o;
125+
O o;
126126
beman::optional::optional<O> oo1 = o;
127127
EXPECT_TRUE(oo1.has_value());
128128
oo1 = o;
@@ -440,7 +440,7 @@ TEST(OptionalTest, Observers) {
440440
EXPECT_TRUE(success);
441441

442442
beman::optional::optional<move_detector> o4{beman::optional::in_place};
443-
move_detector o5 = std::move(o4).value();
443+
move_detector o5 = std::move(o4).value();
444444
EXPECT_TRUE(o4->been_moved);
445445
EXPECT_TRUE(!o5.been_moved);
446446
}
@@ -724,16 +724,16 @@ TEST(OptionalTest, BreathingTest) {
724724
TEST(OptionalTest, BreathingTestRef) {
725725
beman::optional::optional<int&> m;
726726

727-
int one = 1;
727+
int one = 1;
728728
beman::optional::optional<int&> m1{one};
729729

730730
m = m1;
731731
ASSERT_EQ(*std::begin(m), 1);
732732

733-
double zero = 0.0;
733+
double zero = 0.0;
734734
beman::optional::optional<double&> d0{zero};
735735

736-
double one_d = 1.0;
736+
double one_d = 1.0;
737737
beman::optional::optional<double&> d1{one_d};
738738

739739
d0 = d1;
@@ -762,9 +762,9 @@ TEST(OptionalTest, CompTest) {
762762

763763
TEST(OptionalTest, CompTestRef) {
764764
beman::optional::optional<int&> m;
765-
int zero = 0;
766-
int one = 1;
767-
int one_a = 1;
765+
int zero = 0;
766+
int one = 1;
767+
int one_a = 1;
768768
beman::optional::optional<int&> m0{zero};
769769
beman::optional::optional<int&> m1{one};
770770
beman::optional::optional<int&> m1a{one_a};
@@ -815,7 +815,7 @@ TEST(OptionalTest, PythTripleTest) {
815815
using namespace beman;
816816

817817
TEST(OptionalTest, ValueBase) {
818-
int i = 7;
818+
int i = 7;
819819
beman::optional::optional<int> v1{};
820820

821821
beman::optional::optional<int> v2{i};
@@ -837,15 +837,15 @@ TEST(OptionalTest, RefWrapper) {
837837

838838
TEST(OptionalTest, ValueNonDefaultConstruct) {
839839
using beman::optional::tests::int_ctor;
840-
int_ctor i = 7;
840+
int_ctor i = 7;
841841
beman::optional::optional<int_ctor> v1{};
842842
beman::optional::optional<int_ctor> v2{i};
843843
std::ignore = v1;
844844
std::ignore = v2;
845845
}
846846

847847
TEST(OptionalTest, RefBase) {
848-
int i = 7;
848+
int i = 7;
849849
beman::optional::optional<int&> v1{};
850850
// ASSERT_TRUE(v1.size() == 0);
851851

‎src/beman/optional/tests/optional_constexpr.t.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ TEST(OptionalConstexprTest, Constructors) {
1717
std::ignore = i1;
1818
std::ignore = i2;
1919

20-
constexpr int i = 0;
20+
constexpr int i = 0;
2121
constexpr beman::optional::optional<int> i3 = i;
22-
std::ignore = i3;
22+
std::ignore = i3;
2323

2424
constexpr beman::optional::optional<beman::optional::tests::empty> e1;
25-
constexpr beman::optional::optional<int> e2{beman::optional::nullopt};
25+
constexpr beman::optional::optional<int> e2{beman::optional::nullopt};
2626

27-
constexpr beman::optional::tests::empty e{};
27+
constexpr beman::optional::tests::empty e{};
2828
constexpr beman::optional::optional<beman::optional::tests::empty> e3 = e;
29-
std::ignore = e1;
30-
std::ignore = e2;
31-
std::ignore = e;
32-
std::ignore = e3;
29+
std::ignore = e1;
30+
std::ignore = e2;
31+
std::ignore = e;
32+
std::ignore = e3;
3333
}
3434

3535
TEST(OptionalConstexprTest, Constructors2) {
@@ -69,7 +69,7 @@ TEST(OptionalConstexprTest, Constructors2) {
6969
}
7070

7171
{
72-
static constexpr auto i = 42;
72+
static constexpr auto i = 42;
7373
constexpr beman::optional::optional<const int&> o = i;
7474
EXPECT_TRUE(o);
7575
EXPECT_TRUE(*o == 42);
@@ -88,8 +88,8 @@ TEST(OptionalConstexprTest, Constructors3) {
8888
using beman::optional::tests::base;
8989
using beman::optional::tests::derived;
9090

91-
constexpr base b{1};
92-
constexpr derived d(1, 2);
91+
constexpr base b{1};
92+
constexpr derived d(1, 2);
9393
constexpr beman::optional::optional<base> b1{b};
9494
constexpr beman::optional::optional<base> b2{d};
9595

@@ -114,15 +114,15 @@ class NoDefault {
114114
} // namespace
115115

116116
TEST(OptionalConstexprTest, NonDefaultConstruct) {
117-
constexpr NoDefault i = 7;
117+
constexpr NoDefault i = 7;
118118
constexpr beman::optional::optional<NoDefault> v1{};
119119
constexpr beman::optional::optional<NoDefault> v2{i};
120120
std::ignore = v1;
121121
std::ignore = v2;
122122
}
123123

124124
consteval bool testConstexprAssignmentValue() {
125-
bool retval = true;
125+
bool retval = true;
126126
beman::optional::optional<int> o1 = 42;
127127
beman::optional::optional<int> o2 = 12;
128128
beman::optional::optional<int> o3;
@@ -194,7 +194,7 @@ struct takes_init_and_variadic {
194194
};
195195

196196
consteval bool testConstexprInPlace() {
197-
bool retval = true;
197+
bool retval = true;
198198
constexpr beman::optional::optional<int> o1{beman::optional::in_place};
199199
constexpr beman::optional::optional<int> o2(beman::optional::in_place);
200200
retval &= (bool(o1));

0 commit comments

Comments
 (0)