Skip to content

Commit 1a85e8b

Browse files
acmorrowacmorrow
committed
minor: clang-format pass
1 parent d1583f6 commit 1a85e8b

22 files changed

+167
-175
lines changed

‎examples/bsoncxx/getting_values.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@ int main(int, char**) {
9090
};
9191

9292
// Make all variables used.
93-
return (awards && first_award_year && second_award_year && last_name) ?
94-
EXIT_SUCCESS : EXIT_FAILURE;
93+
return (awards && first_award_year && second_award_year && last_name) ? EXIT_SUCCESS
94+
: EXIT_FAILURE;
9595
}

‎examples/bsoncxx/view_and_value.cpp

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,10 @@ int main(int, char**) {
2525
using builder::basic::sub_array;
2626

2727
auto doc = builder::basic::document{};
28-
doc.append(kvp("team", "platforms"),
29-
kvp("id", types::b_oid{oid(oid::init_tag)}),
28+
doc.append(kvp("team", "platforms"), kvp("id", types::b_oid{oid(oid::init_tag)}),
3029
kvp("members", [](sub_array sa) {
31-
sa.append("tyler", "jason", "drew",
32-
"sam", "ernie", "john",
33-
"mark", "crystal");
34-
})
35-
);
30+
sa.append("tyler", "jason", "drew", "sam", "ernie", "john", "mark", "crystal");
31+
}));
3632

3733
// document::value is an owning bson document conceptually similar to string.
3834
document::value value{doc.extract()};
@@ -49,7 +45,6 @@ int main(int, char**) {
4945

5046
// iterate over the elements in a bson document
5147
for (document::element ele : view) {
52-
5348
// element is non owning view of a key-value pair within a document.
5449

5550
// we can use the key() method to get a string_view of the key.
@@ -59,31 +54,32 @@ int main(int, char**) {
5954

6055
// we can use type() to get the type of the value.
6156
switch (ele.type()) {
62-
case type::k_utf8:
63-
std::cout << "Got String!" << std::endl;
64-
break;
65-
case type::k_oid:
66-
std::cout << "Got ObjectId!" << std::endl;
67-
break;
68-
case type::k_array: {
69-
std::cout << "Got Array!" << std::endl;
70-
// if we have a subarray, we can access it by getting a view of it.
71-
array::view subarr{ele.get_array().value};
72-
for (array::element ele : subarr) {
73-
std::cout << "array element: " << to_json(ele.get_value()) << std::endl;
57+
case type::k_utf8:
58+
std::cout << "Got String!" << std::endl;
59+
break;
60+
case type::k_oid:
61+
std::cout << "Got ObjectId!" << std::endl;
62+
break;
63+
case type::k_array: {
64+
std::cout << "Got Array!" << std::endl;
65+
// if we have a subarray, we can access it by getting a view of it.
66+
array::view subarr{ele.get_array().value};
67+
for (array::element ele : subarr) {
68+
std::cout << "array element: " << to_json(ele.get_value()) << std::endl;
69+
}
70+
break;
7471
}
75-
break;
76-
}
77-
default:
78-
std::cout << "We messed up!" << std::endl;
72+
default:
73+
std::cout << "We messed up!" << std::endl;
7974
}
8075

8176
// usually we don't need to actually use a switch statement, because we can also
8277
// get a variant 'value' that can hold any BSON type.
8378
types::value ele_val{ele.get_value()};
8479
// if we need to print an arbitrary value, we can use to_json, which provides
8580
// a suitable overload.
86-
std::cout << "the value is " << to_json(ele_val) << std::endl;;
81+
std::cout << "the value is " << to_json(ele_val) << std::endl;
82+
;
8783
}
8884

8985
// If we want to search for an element we can use operator[]

‎examples/mongocxx/bulk_write.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,9 @@ int main(int, char**) {
9393
}
9494

9595
std::cout << "Upserted IDs" << std::endl;
96-
for (const auto &id : result->upserted_ids()) {
97-
std::cout << "Bulk write index: " << id.first << std::endl << bsoncxx::to_json(id.second) << std::endl;
96+
for (const auto& id : result->upserted_ids()) {
97+
std::cout << "Bulk write index: " << id.first << std::endl
98+
<< bsoncxx::to_json(id.second) << std::endl;
9899
}
99100

100101
// The collection should contain two copies of {"a": 2}.

‎src/bsoncxx/document/view.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ bson_iter_t to_bson_iter_t(element e) {
3535
i.next_off = e.offset();
3636
return i;
3737
}
38-
} // namespace
38+
} // namespace
3939

4040
view::iterator::iterator() {
4141
}

‎src/bsoncxx/json.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,11 +288,10 @@ std::string to_json(types::value value) {
288288

289289
stdx::optional<document::value> from_json(stdx::string_view json) {
290290
bson_error_t error;
291-
bson_t* result = bson_new_from_json(
292-
reinterpret_cast<const uint8_t*>(json.data()), json.size(), &error);
291+
bson_t* result =
292+
bson_new_from_json(reinterpret_cast<const uint8_t*>(json.data()), json.size(), &error);
293293

294-
if (!result)
295-
return stdx::nullopt;
294+
if (!result) return stdx::nullopt;
296295

297296
std::uint32_t length;
298297
std::uint8_t* buf = bson_destroy_with_steal(result, true, &length);

‎src/bsoncxx/test/bson_get_values.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ TEST_CASE("[] can reach into nested arrays", "[bsoncxx]") {
4949
REQUIRE(!doc["ints"][2][9]);
5050
REQUIRE(!doc["bools"][9]);
5151
}
52-
5352
}
5453

5554
TEST_CASE("[] can reach into nested documents", "[bsoncxx]") {

‎src/bsoncxx/test/json.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include <bsoncxx/json.hpp>
55

66
namespace {
7-
constexpr auto k_invalid_json = R"({])";
8-
constexpr auto k_valid_json = R"({ "a" : 1, "b" : 2.0 })";
7+
constexpr auto k_invalid_json = R"({])";
8+
constexpr auto k_valid_json = R"({ "a" : 1, "b" : 2.0 })";
99
}
1010

1111
TEST_CASE("invalid json returns disengaged optional") {
@@ -21,7 +21,8 @@ TEST_CASE("valid json returns an engaged optional") {
2121
TEST_CASE("valid json is converted to equivalent BSON") {
2222
using namespace bsoncxx;
2323

24-
const auto expected = builder::stream::document{} << "a" << 1 << "b" << 2.0 << builder::stream::finalize;
24+
const auto expected = builder::stream::document{} << "a" << 1 << "b" << 2.0
25+
<< builder::stream::finalize;
2526
const auto expected_view = expected.view();
2627

2728
const auto actual = from_json(k_valid_json);

‎src/bsoncxx/types/value.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ namespace types {
3030
// Boost doesn't mark the copy constructor and copy-assignment operator of string_ref as noexcept
3131
// so we can't rely on automatic noexcept propagation. It really is though, so it is OK.
3232
#if !defined(BSONCXX_POLY_USE_BOOST)
33-
#define BSONCXX_ENUM(name, val) \
34-
value::value(b_##name value) noexcept : _type(static_cast<bsoncxx::type>(val)), \
35-
_b_##name(std::move(value)) { \
36-
static_assert(std::is_nothrow_copy_constructible<b_##name>::value, "Copy may throw"); \
37-
static_assert(std::is_nothrow_copy_assignable<b_##name>::value, "Copy may throw"); \
33+
#define BSONCXX_ENUM(name, val) \
34+
value::value(b_##name value) noexcept : _type(static_cast<bsoncxx::type>(val)), \
35+
_b_##name(std::move(value)) { \
36+
static_assert(std::is_nothrow_copy_constructible<b_##name>::value, "Copy may throw"); \
37+
static_assert(std::is_nothrow_copy_assignable<b_##name>::value, "Copy may throw"); \
3838
static_assert(std::is_nothrow_destructible<b_##name>::value, "Destruction may throw"); \
3939
}
4040
#else
41-
#define BSONCXX_ENUM(name, val) \
42-
value::value(b_##name value) noexcept : _type(static_cast<bsoncxx::type>(val)), \
43-
_b_##name(std::move(value)) { \
41+
#define BSONCXX_ENUM(name, val) \
42+
value::value(b_##name value) noexcept : _type(static_cast<bsoncxx::type>(val)), \
43+
_b_##name(std::move(value)) { \
4444
static_assert(std::is_nothrow_destructible<b_##name>::value, "Destruction may throw"); \
4545
}
4646
#endif

‎src/mongocxx/exception/operation_exception.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
namespace mongocxx {
2323
MONGOCXX_INLINE_NAMESPACE_BEGIN
2424

25-
operation_exception::operation_exception(std::error_code ec, bsoncxx::document::value&& raw_server_error, std::string what_arg)
25+
operation_exception::operation_exception(std::error_code ec,
26+
bsoncxx::document::value&& raw_server_error,
27+
std::string what_arg)
2628
: exception(ec, what_arg), _raw_server_error{std::move(raw_server_error)} {
2729
}
2830

‎src/mongocxx/insert_many_builder.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@ options::bulk_write make_bulk_write_options(const options::insert& insert_option
3636
return bw;
3737
}
3838

39-
} // namespace
39+
} // namespace
4040

4141
insert_many_builder::insert_many_builder(const options::insert& options)
42-
: _writes{make_bulk_write_options(options)}, _inserted_ids{}, _index{0} {
43-
};
42+
: _writes{make_bulk_write_options(options)}, _inserted_ids{}, _index{0} {};
4443

4544
void insert_many_builder::operator()(const bsoncxx::document::view& doc) {
4645
if (!doc["_id"]) {

‎src/mongocxx/model/write.cpp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,33 @@ MONGOCXX_INLINE_NAMESPACE_BEGIN
2323
namespace model {
2424

2525
write::write(insert_one value) : _type(write_type::k_insert_one), _insert_one(std::move(value)) {
26-
static_assert(std::is_nothrow_move_constructible<insert_one>::value, "Move-construct may throw");
26+
static_assert(std::is_nothrow_move_constructible<insert_one>::value,
27+
"Move-construct may throw");
2728
static_assert(std::is_nothrow_move_assignable<insert_one>::value, "Move-assign may throw");
2829
}
2930
write::write(delete_one value) : _type(write_type::k_delete_one), _delete_one(std::move(value)) {
30-
static_assert(std::is_nothrow_move_constructible<delete_one>::value, "Move-construct may throw");
31+
static_assert(std::is_nothrow_move_constructible<delete_one>::value,
32+
"Move-construct may throw");
3133
static_assert(std::is_nothrow_move_assignable<delete_one>::value, "Move-assign may throw");
3234
}
3335
write::write(delete_many value) : _type(write_type::k_delete_many), _delete_many(std::move(value)) {
34-
static_assert(std::is_nothrow_move_constructible<delete_many>::value, "Move-construct may throw");
36+
static_assert(std::is_nothrow_move_constructible<delete_many>::value,
37+
"Move-construct may throw");
3538
static_assert(std::is_nothrow_move_assignable<delete_many>::value, "Move-assign may throw");
3639
}
3740
write::write(update_one value) : _type(write_type::k_update_one), _update_one(std::move(value)) {
38-
static_assert(std::is_nothrow_move_constructible<update_one>::value, "Move-construct may throw");
41+
static_assert(std::is_nothrow_move_constructible<update_one>::value,
42+
"Move-construct may throw");
3943
static_assert(std::is_nothrow_move_assignable<update_one>::value, "Move-assign may throw");
4044
}
4145
write::write(update_many value) : _type(write_type::k_update_many), _update_many(std::move(value)) {
42-
static_assert(std::is_nothrow_move_constructible<update_many>::value, "Move-construct may throw");
46+
static_assert(std::is_nothrow_move_constructible<update_many>::value,
47+
"Move-construct may throw");
4348
static_assert(std::is_nothrow_move_assignable<update_many>::value, "Move-assign may throw");
4449
}
4550
write::write(replace_one value) : _type(write_type::k_replace_one), _replace_one(std::move(value)) {
46-
static_assert(std::is_nothrow_move_constructible<replace_one>::value, "Move-construct may throw");
51+
static_assert(std::is_nothrow_move_constructible<replace_one>::value,
52+
"Move-construct may throw");
4753
static_assert(std::is_nothrow_move_assignable<replace_one>::value, "Move-assign may throw");
4854
}
4955

‎src/mongocxx/options/bulk_write.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ namespace mongocxx {
2020
MONGOCXX_INLINE_NAMESPACE_BEGIN
2121
namespace options {
2222

23-
bulk_write::bulk_write()
24-
: _ordered(true) {}
23+
bulk_write::bulk_write() : _ordered(true) {
24+
}
2525

2626
void bulk_write::ordered(bool ordered) {
2727
_ordered = ordered;

‎src/mongocxx/options/find_one_and_replace.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ const stdx::optional<bsoncxx::document::view_or_value>& find_one_and_replace::pr
5656
return _projection;
5757
}
5858

59-
const stdx::optional<mongocxx::options::return_document>& find_one_and_replace::return_document() const {
59+
const stdx::optional<mongocxx::options::return_document>& find_one_and_replace::return_document()
60+
const {
6061
return _return_document;
6162
}
6263

‎src/mongocxx/pool.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,9 @@ pool::entry pool::acquire() {
6464

6565
stdx::optional<pool::entry> pool::try_acquire() {
6666
auto cli = libmongoc::client_pool_try_pop(_impl->client_pool_t);
67-
if (!cli)
68-
return stdx::nullopt;
67+
if (!cli) return stdx::nullopt;
6968

70-
return pool::entry{new client(cli), [this](client* client) {
71-
_release(client);
72-
}};
69+
return pool::entry{new client(cli), [this](client* client) { _release(client); }};
7370
}
7471

7572
MONGOCXX_INLINE_NAMESPACE_END

‎src/mongocxx/result/replace_one.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ std::int32_t replace_one::modified_count() const {
3636
}
3737

3838
stdx::optional<bsoncxx::document::element> replace_one::upserted_id() const {
39-
if (_result.upserted_ids().size() == 0) {
40-
return stdx::nullopt;
41-
}
42-
return _result.upserted_ids()[0];
39+
if (_result.upserted_ids().size() == 0) {
40+
return stdx::nullopt;
41+
}
42+
return _result.upserted_ids()[0];
4343
}
4444

4545
} // namespace result

‎src/mongocxx/result/update.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ std::int32_t update::modified_count() const {
3636

3737
stdx::optional<bsoncxx::document::element> update::upserted_id() const {
3838
if (_result.upserted_ids().size() == 0) {
39-
return stdx::nullopt;
40-
}
41-
return _result.upserted_ids()[0];
39+
return stdx::nullopt;
40+
}
41+
return _result.upserted_ids()[0];
4242
}
4343

4444
} // namespace result

‎src/mongocxx/test/bulk_write.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ TEST_CASE("a bulk_write will setup a mongoc bulk operation", "[bulk_write]") {
4747
REQUIRE(construct_called);
4848
REQUIRE(!ordered_value);
4949
}
50-
5150
}
5251

5352
TEST_CASE("destruction of a bulk_write will destroy mongoc operation", "[bulk_write]") {

‎src/mongocxx/test/client.cpp

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,15 @@ TEST_CASE("A client's read preferences may be set and obtained", "[client]") {
123123
auto deleter = [](mongoc_read_prefs_t* var) { mongoc_read_prefs_destroy(var); };
124124
std::unique_ptr<mongoc_read_prefs_t, decltype(deleter)> saved_preference(nullptr, deleter);
125125

126-
client_set_preference->interpose([&](mongoc_client_t*,
127-
const mongoc_read_prefs_t* read_prefs) {
126+
client_set_preference->interpose([&](mongoc_client_t*, const mongoc_read_prefs_t* read_prefs) {
128127
called_set = true;
129128
saved_preference.reset(mongoc_read_prefs_copy(read_prefs));
130129
REQUIRE(mongoc_read_prefs_get_mode(read_prefs) ==
131130
static_cast<mongoc_read_mode_t>(read_preference::read_mode::k_secondary_preferred));
132131
});
133132

134-
client_get_preference->interpose([&](const mongoc_client_t*) {
135-
return saved_preference.get();
136-
}).forever();
133+
client_get_preference->interpose([&](const mongoc_client_t*) { return saved_preference.get(); })
134+
.forever();
137135

138136
mongo_client.read_preference(std::move(preference));
139137
REQUIRE(called_set);
@@ -152,11 +150,10 @@ TEST_CASE("A client's write concern may be set and obtained", "[client]") {
152150
mongoc_write_concern_t* underlying_wc;
153151

154152
bool set_called = false;
155-
client_set_concern->interpose(
156-
[&](mongoc_client_t*, const mongoc_write_concern_t* concern) {
157-
set_called = true;
158-
underlying_wc = mongoc_write_concern_copy(concern);
159-
});
153+
client_set_concern->interpose([&](mongoc_client_t*, const mongoc_write_concern_t* concern) {
154+
set_called = true;
155+
underlying_wc = mongoc_write_concern_copy(concern);
156+
});
160157

161158
bool get_called = false;
162159
client_get_concern->interpose([&](const mongoc_client_t*) {

‎src/mongocxx/test/collection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ TEST_CASE("CRUD functionality", "[driver::collection]") {
527527
auto distinct_cname = "distinct_coll";
528528
auto distinct_coll = db[distinct_cname];
529529
distinct_coll.drop();
530-
530+
531531
auto doc1 = document{} << "foo"
532532
<< "baz"
533533
<< "garply" << 1 << finalize;

0 commit comments

Comments
 (0)