Skip to content

Commit 53c0512

Browse files
pre-commit-ci[bot]ax3l
pre-commit-ci[bot]
and
ax3l
authored
[pre-commit.ci] pre-commit autoupdate, Clang-Format 20 (#1736)
* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/pre-commit/mirrors-clang-format: v19.1.7 → v20.1.0](pre-commit/mirrors-clang-format@v19.1.7...v20.1.0) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * More Clang-Format 20 Updates --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Axel Huebl <axel.huebl@plasma.ninja>
1 parent 67dc826 commit 53c0512

File tree

20 files changed

+267
-226
lines changed

20 files changed

+267
-226
lines changed

‎.github/workflows/clang-format/clang-format.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
if (( $# > 0 )); then
44
# received arguments, format those files
5-
clang-format-18 -i "$@"
5+
clang-format-20 -i "$@"
66
else
77
# received no arguments, find files on our own
88
find include/ src/ test/ examples/ \
99
-regextype egrep \
1010
-type f -regex '.*\.(hpp|cpp|hpp\.in)$' \
11-
| xargs clang-format-18 -i
11+
| xargs clang-format-20 -i
1212
fi

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ repos:
6666
# clang-format v13
6767
# to run manually, use .github/workflows/clang-format/clang-format.sh
6868
- repo: https://github.com/pre-commit/mirrors-clang-format
69-
rev: v19.1.7
69+
rev: v20.1.0
7070
hooks:
7171
- id: clang-format
7272
# By default, the clang-format hook configures:

‎environment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ name: openPMD-api-dev
33
channels:
44
- conda-forge
55
dependencies:
6-
- clang-format-18=18.1.2
6+
- clang-format-20=20.1.0
77
- bash=5

‎examples/7_extended_write_serial.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ int main()
2121
f.setComment("This is fine and actually encouraged by the standard");
2222
f.setAttribute(
2323
"custom_attribute_name",
24-
std::string("This attribute is manually added and can contain "
25-
"about any datatype you would want"));
24+
std::string(
25+
"This attribute is manually added and can contain "
26+
"about any datatype you would want"));
2627
// note that removing attributes required by the standard typically
2728
// makes the file unusable for post-processing
2829
f.deleteAttribute("custom_attribute_name");

‎include/openPMD/IO/IOTask.hpp‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ struct OPENPMDAPI_EXPORT Parameter : public AbstractParameter
151151
};
152152

153153
template <>
154-
struct OPENPMDAPI_EXPORT Parameter<Operation::CREATE_FILE>
155-
: public AbstractParameter
154+
struct OPENPMDAPI_EXPORT
155+
Parameter<Operation::CREATE_FILE> : public AbstractParameter
156156
{
157157
Parameter() = default;
158158
Parameter(Parameter &&) = default;
@@ -170,8 +170,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::CREATE_FILE>
170170
};
171171

172172
template <>
173-
struct OPENPMDAPI_EXPORT Parameter<Operation::CHECK_FILE>
174-
: public AbstractParameter
173+
struct OPENPMDAPI_EXPORT
174+
Parameter<Operation::CHECK_FILE> : public AbstractParameter
175175
{
176176
Parameter() = default;
177177
Parameter(Parameter &&) = default;
@@ -197,8 +197,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::CHECK_FILE>
197197
};
198198

199199
template <>
200-
struct OPENPMDAPI_EXPORT Parameter<Operation::OPEN_FILE>
201-
: public AbstractParameter
200+
struct OPENPMDAPI_EXPORT
201+
Parameter<Operation::OPEN_FILE> : public AbstractParameter
202202
{
203203
Parameter() = default;
204204
Parameter(Parameter &&) = default;
@@ -233,8 +233,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::OPEN_FILE>
233233
};
234234

235235
template <>
236-
struct OPENPMDAPI_EXPORT Parameter<Operation::CLOSE_FILE>
237-
: public AbstractParameter
236+
struct OPENPMDAPI_EXPORT
237+
Parameter<Operation::CLOSE_FILE> : public AbstractParameter
238238
{
239239
Parameter() = default;
240240
Parameter(Parameter &&) = default;
@@ -250,8 +250,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::CLOSE_FILE>
250250
};
251251

252252
template <>
253-
struct OPENPMDAPI_EXPORT Parameter<Operation::DELETE_FILE>
254-
: public AbstractParameter
253+
struct OPENPMDAPI_EXPORT
254+
Parameter<Operation::DELETE_FILE> : public AbstractParameter
255255
{
256256
Parameter() = default;
257257
Parameter(Parameter &&) = default;
@@ -269,8 +269,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::DELETE_FILE>
269269
};
270270

271271
template <>
272-
struct OPENPMDAPI_EXPORT Parameter<Operation::CREATE_PATH>
273-
: public AbstractParameter
272+
struct OPENPMDAPI_EXPORT
273+
Parameter<Operation::CREATE_PATH> : public AbstractParameter
274274
{
275275
Parameter() = default;
276276
Parameter(Parameter &&) = default;
@@ -288,8 +288,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::CREATE_PATH>
288288
};
289289

290290
template <>
291-
struct OPENPMDAPI_EXPORT Parameter<Operation::CLOSE_PATH>
292-
: public AbstractParameter
291+
struct OPENPMDAPI_EXPORT
292+
Parameter<Operation::CLOSE_PATH> : public AbstractParameter
293293
{
294294
Parameter() = default;
295295
Parameter(Parameter &&) = default;
@@ -305,8 +305,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::CLOSE_PATH>
305305
};
306306

307307
template <>
308-
struct OPENPMDAPI_EXPORT Parameter<Operation::OPEN_PATH>
309-
: public AbstractParameter
308+
struct OPENPMDAPI_EXPORT
309+
Parameter<Operation::OPEN_PATH> : public AbstractParameter
310310
{
311311
Parameter() = default;
312312
Parameter(Parameter &&) = default;
@@ -324,8 +324,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::OPEN_PATH>
324324
};
325325

326326
template <>
327-
struct OPENPMDAPI_EXPORT Parameter<Operation::DELETE_PATH>
328-
: public AbstractParameter
327+
struct OPENPMDAPI_EXPORT
328+
Parameter<Operation::DELETE_PATH> : public AbstractParameter
329329
{
330330
Parameter() = default;
331331
Parameter(Parameter &&) = default;
@@ -343,8 +343,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::DELETE_PATH>
343343
};
344344

345345
template <>
346-
struct OPENPMDAPI_EXPORT Parameter<Operation::LIST_PATHS>
347-
: public AbstractParameter
346+
struct OPENPMDAPI_EXPORT
347+
Parameter<Operation::LIST_PATHS> : public AbstractParameter
348348
{
349349
Parameter() = default;
350350
Parameter(Parameter &&) = default;
@@ -363,8 +363,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::LIST_PATHS>
363363
};
364364

365365
template <>
366-
struct OPENPMDAPI_EXPORT Parameter<Operation::CREATE_DATASET>
367-
: public AbstractParameter
366+
struct OPENPMDAPI_EXPORT
367+
Parameter<Operation::CREATE_DATASET> : public AbstractParameter
368368
{
369369
Parameter(Dataset const &ds)
370370
: extent(ds.extent)
@@ -402,8 +402,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::CREATE_DATASET>
402402
};
403403

404404
template <>
405-
struct OPENPMDAPI_EXPORT Parameter<Operation::EXTEND_DATASET>
406-
: public AbstractParameter
405+
struct OPENPMDAPI_EXPORT
406+
Parameter<Operation::EXTEND_DATASET> : public AbstractParameter
407407
{
408408
Parameter(Extent e) : joinedDimension(Dataset::joinedDimension(e))
409409
{
@@ -430,8 +430,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::EXTEND_DATASET>
430430
};
431431

432432
template <>
433-
struct OPENPMDAPI_EXPORT Parameter<Operation::OPEN_DATASET>
434-
: public AbstractParameter
433+
struct OPENPMDAPI_EXPORT
434+
Parameter<Operation::OPEN_DATASET> : public AbstractParameter
435435
{
436436
Parameter() = default;
437437
Parameter(Parameter &&) = default;
@@ -457,8 +457,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::OPEN_DATASET>
457457
};
458458

459459
template <>
460-
struct OPENPMDAPI_EXPORT Parameter<Operation::DELETE_DATASET>
461-
: public AbstractParameter
460+
struct OPENPMDAPI_EXPORT
461+
Parameter<Operation::DELETE_DATASET> : public AbstractParameter
462462
{
463463
Parameter() = default;
464464
Parameter(Parameter &&) = default;
@@ -476,8 +476,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::DELETE_DATASET>
476476
};
477477

478478
template <>
479-
struct OPENPMDAPI_EXPORT Parameter<Operation::WRITE_DATASET>
480-
: public AbstractParameter
479+
struct OPENPMDAPI_EXPORT
480+
Parameter<Operation::WRITE_DATASET> : public AbstractParameter
481481
{
482482
Parameter() = default;
483483

@@ -499,8 +499,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::WRITE_DATASET>
499499
};
500500

501501
template <>
502-
struct OPENPMDAPI_EXPORT Parameter<Operation::READ_DATASET>
503-
: public AbstractParameter
502+
struct OPENPMDAPI_EXPORT
503+
Parameter<Operation::READ_DATASET> : public AbstractParameter
504504
{
505505
Parameter() = default;
506506
Parameter(Parameter &&) = default;
@@ -521,8 +521,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::READ_DATASET>
521521
};
522522

523523
template <>
524-
struct OPENPMDAPI_EXPORT Parameter<Operation::LIST_DATASETS>
525-
: public AbstractParameter
524+
struct OPENPMDAPI_EXPORT
525+
Parameter<Operation::LIST_DATASETS> : public AbstractParameter
526526
{
527527
Parameter() = default;
528528
Parameter(Parameter &&) = default;
@@ -541,8 +541,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::LIST_DATASETS>
541541
};
542542

543543
template <>
544-
struct OPENPMDAPI_EXPORT Parameter<Operation::GET_BUFFER_VIEW>
545-
: public AbstractParameter
544+
struct OPENPMDAPI_EXPORT
545+
Parameter<Operation::GET_BUFFER_VIEW> : public AbstractParameter
546546
{
547547
Parameter() = default;
548548
Parameter(Parameter &&) = default;
@@ -572,8 +572,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::GET_BUFFER_VIEW>
572572
};
573573

574574
template <>
575-
struct OPENPMDAPI_EXPORT Parameter<Operation::DELETE_ATT>
576-
: public AbstractParameter
575+
struct OPENPMDAPI_EXPORT
576+
Parameter<Operation::DELETE_ATT> : public AbstractParameter
577577
{
578578
Parameter() = default;
579579
Parameter(Parameter &&) = default;
@@ -591,8 +591,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::DELETE_ATT>
591591
};
592592

593593
template <>
594-
struct OPENPMDAPI_EXPORT Parameter<Operation::WRITE_ATT>
595-
: public AbstractParameter
594+
struct OPENPMDAPI_EXPORT
595+
Parameter<Operation::WRITE_ATT> : public AbstractParameter
596596
{
597597
Parameter() = default;
598598
Parameter(Parameter &&) = default;
@@ -625,8 +625,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::WRITE_ATT>
625625
};
626626

627627
template <>
628-
struct OPENPMDAPI_EXPORT Parameter<Operation::READ_ATT>
629-
: public AbstractParameter
628+
struct OPENPMDAPI_EXPORT
629+
Parameter<Operation::READ_ATT> : public AbstractParameter
630630
{
631631
Parameter() = default;
632632
Parameter(Parameter &&) = default;
@@ -647,8 +647,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::READ_ATT>
647647
};
648648

649649
template <>
650-
struct OPENPMDAPI_EXPORT Parameter<Operation::READ_ATT_ALLSTEPS>
651-
: public AbstractParameter
650+
struct OPENPMDAPI_EXPORT
651+
Parameter<Operation::READ_ATT_ALLSTEPS> : public AbstractParameter
652652
{
653653
Parameter() = default;
654654
Parameter(Parameter &&) = default;
@@ -679,8 +679,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::READ_ATT_ALLSTEPS>
679679
};
680680

681681
template <>
682-
struct OPENPMDAPI_EXPORT Parameter<Operation::LIST_ATTS>
683-
: public AbstractParameter
682+
struct OPENPMDAPI_EXPORT
683+
Parameter<Operation::LIST_ATTS> : public AbstractParameter
684684
{
685685
Parameter() = default;
686686
Parameter(Parameter &&) = default;
@@ -699,8 +699,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::LIST_ATTS>
699699
};
700700

701701
template <>
702-
struct OPENPMDAPI_EXPORT Parameter<Operation::ADVANCE>
703-
: public AbstractParameter
702+
struct OPENPMDAPI_EXPORT
703+
Parameter<Operation::ADVANCE> : public AbstractParameter
704704
{
705705
Parameter() = default;
706706
Parameter(Parameter &&) = default;
@@ -736,8 +736,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::ADVANCE>
736736
};
737737

738738
template <>
739-
struct OPENPMDAPI_EXPORT Parameter<Operation::AVAILABLE_CHUNKS>
740-
: public AbstractParameter
739+
struct OPENPMDAPI_EXPORT
740+
Parameter<Operation::AVAILABLE_CHUNKS> : public AbstractParameter
741741
{
742742
Parameter() = default;
743743
Parameter(Parameter &&) = default;
@@ -756,8 +756,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::AVAILABLE_CHUNKS>
756756
};
757757

758758
template <>
759-
struct OPENPMDAPI_EXPORT Parameter<Operation::DEREGISTER>
760-
: public AbstractParameter
759+
struct OPENPMDAPI_EXPORT
760+
Parameter<Operation::DEREGISTER> : public AbstractParameter
761761
{
762762
Parameter(void const *ptr_in) : former_parent(ptr_in)
763763
{}
@@ -796,8 +796,8 @@ struct OPENPMDAPI_EXPORT Parameter<Operation::TOUCH> : public AbstractParameter
796796
};
797797

798798
template <>
799-
struct OPENPMDAPI_EXPORT Parameter<Operation::SET_WRITTEN>
800-
: public AbstractParameter
799+
struct OPENPMDAPI_EXPORT
800+
Parameter<Operation::SET_WRITTEN> : public AbstractParameter
801801
{
802802
explicit Parameter() = default;
803803

‎include/openPMD/backend/Attribute.hpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ namespace detail
122122
}
123123
else
124124
{
125-
return {
126-
std::runtime_error("getCast: cast from string to char only "
127-
"possible if string has length 1.")};
125+
return {std::runtime_error(
126+
"getCast: cast from string to char only "
127+
"possible if string has length 1.")};
128128
}
129129
}
130130
else if constexpr (
@@ -286,8 +286,9 @@ namespace detail
286286
{
287287
auto exception = std::get<std::runtime_error>(conv);
288288
return {std::runtime_error(
289-
std::string("getCast: no scalar to vector conversion "
290-
"possible, recursive error: ") +
289+
std::string(
290+
"getCast: no scalar to vector conversion "
291+
"possible, recursive error: ") +
291292
exception.what())};
292293
}
293294
}

0 commit comments

Comments
 (0)