Skip to content

Commit e863fbb

Browse files
committed
chore: bump clang-tidy to 13
Signed-off-by: Henry Schreiner <[email protected]>
1 parent e2dcd95 commit e863fbb

File tree

6 files changed

+73
-72
lines changed

6 files changed

+73
-72
lines changed

.clang-tidy

Lines changed: 61 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
FormatStyle: file
22

3-
Checks: '
4-
*bugprone*,
5-
clang-analyzer-optin.performance.Padding,
6-
clang-analyzer-optin.cplusplus.VirtualCall,
7-
cppcoreguidelines-init-variables,
8-
cppcoreguidelines-prefer-member-initializer,
9-
cppcoreguidelines-pro-type-static-cast-downcast,
10-
cppcoreguidelines-slicing,
11-
google-explicit-constructor,
12-
llvm-namespace-comment,
13-
misc-definitions-in-headers,
14-
misc-misplaced-const,
15-
misc-non-copyable-objects,
16-
misc-static-assert,
17-
misc-throw-by-value-catch-by-reference,
18-
misc-uniqueptr-reset-release,
19-
misc-unused-parameters,
20-
modernize-avoid-bind,
21-
modernize-loop-convert,
22-
modernize-make-shared,
23-
modernize-redundant-void-arg,
24-
modernize-replace-auto-ptr,
25-
modernize-replace-disallow-copy-and-assign-macro,
26-
modernize-replace-random-shuffle,
27-
modernize-shrink-to-fit,
28-
modernize-use-auto,
29-
modernize-use-bool-literals,
30-
modernize-use-default-member-init,
31-
modernize-use-equals-default,
32-
modernize-use-equals-delete,
33-
modernize-use-emplace,
34-
modernize-use-noexcept,
35-
modernize-use-nullptr,
36-
modernize-use-override,
37-
modernize-use-using,
38-
*performance*,
39-
readability-avoid-const-params-in-decls,
40-
readability-braces-around-statements,
41-
readability-const-return-type,
42-
readability-container-size-empty,
43-
readability-delete-null-pointer,
44-
readability-else-after-return,
45-
readability-implicit-bool-conversion,
46-
readability-inconsistent-declaration-parameter-name,
47-
readability-make-member-function-const,
48-
readability-misplaced-array-index,
49-
readability-non-const-parameter,
50-
readability-qualified-auto,
51-
readability-redundant-function-ptr-dereference,
52-
readability-redundant-smartptr-get,
53-
readability-redundant-string-cstr,
54-
readability-simplify-subscript-expr,
55-
readability-static-accessed-through-instance,
56-
readability-static-definition-in-anonymous-namespace,
57-
readability-string-compare,
58-
readability-suspicious-call-argument,
59-
readability-uniqueptr-delete-release,
60-
-bugprone-exception-escape,
61-
-bugprone-reserved-identifier,
62-
-bugprone-unused-raii,
63-
'
3+
Checks: |
4+
*bugprone*,
5+
*performance*,
6+
clang-analyzer-optin.cplusplus.VirtualCall,
7+
clang-analyzer-optin.performance.Padding,
8+
cppcoreguidelines-init-variables,
9+
cppcoreguidelines-prefer-member-initializer,
10+
cppcoreguidelines-pro-type-static-cast-downcast,
11+
cppcoreguidelines-slicing,
12+
google-explicit-constructor,
13+
llvm-namespace-comment,
14+
misc-definitions-in-headers,
15+
misc-misplaced-const,
16+
misc-non-copyable-objects,
17+
misc-static-assert,
18+
misc-throw-by-value-catch-by-reference,
19+
misc-uniqueptr-reset-release,
20+
misc-unused-parameters,
21+
modernize-avoid-bind,
22+
modernize-loop-convert,
23+
modernize-make-shared,
24+
modernize-redundant-void-arg,
25+
modernize-replace-auto-ptr,
26+
modernize-replace-disallow-copy-and-assign-macro,
27+
modernize-replace-random-shuffle,
28+
modernize-shrink-to-fit,
29+
modernize-use-auto,
30+
modernize-use-bool-literals,
31+
modernize-use-default-member-init,
32+
modernize-use-emplace,
33+
modernize-use-equals-default,
34+
modernize-use-equals-delete,
35+
modernize-use-noexcept,
36+
modernize-use-nullptr,
37+
modernize-use-override,
38+
modernize-use-using,
39+
readability-avoid-const-params-in-decls,
40+
readability-braces-around-statements,
41+
readability-const-return-type,
42+
readability-container-size-empty,
43+
readability-delete-null-pointer,
44+
readability-else-after-return,
45+
readability-implicit-bool-conversion,
46+
readability-inconsistent-declaration-parameter-name,
47+
readability-make-member-function-const,
48+
readability-misplaced-array-index,
49+
readability-non-const-parameter,
50+
readability-qualified-auto,
51+
readability-redundant-function-ptr-dereference,
52+
readability-redundant-smartptr-get,
53+
readability-redundant-string-cstr,
54+
readability-simplify-subscript-expr,
55+
readability-static-accessed-through-instance,
56+
readability-static-definition-in-anonymous-namespace,
57+
readability-string-compare,
58+
readability-suspicious-call-argument,
59+
readability-uniqueptr-delete-release,
60+
-bugprone-easily-swappable-parameters,
61+
-bugprone-exception-escape,
62+
-bugprone-reserved-identifier,
63+
-bugprone-unused-raii,
6464
6565
CheckOptions:
6666
- key: performance-for-range-copy.WarnOnAllAutoCopies
@@ -73,5 +73,3 @@ CheckOptions:
7373
value: true
7474

7575
HeaderFilterRegex: 'pybind11/.*h'
76-
77-
WarningsAsErrors: '*'

.github/CONTRIBUTING.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,14 @@ directory inside your pybind11 git clone. Files will be modified in place,
235235
so you can use git to monitor the changes.
236236

237237
```bash
238-
docker run --rm -v $PWD:/mounted_pybind11 -it silkeh/clang:12
238+
docker run --rm -v $PWD:/mounted_pybind11 -it silkeh/clang:13
239239
apt-get update && apt-get install -y python3-dev python3-pytest
240-
cmake -S /mounted_pybind11/ -B build -DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy);-fix" -DDOWNLOAD_EIGEN=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=17
241-
cmake --build build -j 2 -- --keep-going
240+
cmake -S /mounted_pybind11/ -B build -DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy);--use-color" -DDOWNLOAD_EIGEN=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=17
241+
cmake --build build -j 2
242242
```
243243

244+
You can add `--fix` to the options list if you want.
245+
244246
### Include what you use
245247

246248
To run include what you use, install (`brew install include-what-you-use` on

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,8 @@ jobs:
280280
std: 20
281281
- clang: 10
282282
std: 17
283+
- clang: 14
284+
std: 20
283285

284286
name: "🐍 3 • Clang ${{ matrix.clang }} • C++${{ matrix.std }} • x64"
285287
container: "silkeh/clang:${{ matrix.clang }}"

.github/workflows/format.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# in .github/CONTRIBUTING.md and update as needed.
3535
name: Clang-Tidy
3636
runs-on: ubuntu-latest
37-
container: silkeh/clang:12
37+
container: silkeh/clang:13
3838
steps:
3939
- uses: actions/checkout@v3
4040

@@ -44,7 +44,7 @@ jobs:
4444
- name: Configure
4545
run: >
4646
cmake -S . -B build
47-
-DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy)"
47+
-DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy);--use-color;--warnings-as-errors=*"
4848
-DDOWNLOAD_EIGEN=ON
4949
-DDOWNLOAD_CATCH=ON
5050
-DCMAKE_CXX_STANDARD=17

tests/test_embed/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if("${PYTHON_MODULE_EXTENSION}" MATCHES "pypy" OR "${Python_INTERPRETER_ID}" STR
77
return()
88
endif()
99

10-
find_package(Catch 2.13.5)
10+
find_package(Catch 2.13.9)
1111

1212
if(CATCH_FOUND)
1313
message(STATUS "Building interpreter tests using Catch v${CATCH_VERSION}")

tests/test_virtual_functions.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,9 +342,8 @@ TEST_SUBMODULE(virtual_functions, m) {
342342
const AdderBase &adder,
343343
const AdderBase::DataVisitor &visitor) {
344344
adder(first, second, [&](const AdderBase::Data &first_plus_second) {
345-
adder(first_plus_second,
346-
third,
347-
visitor); // NOLINT(readability-suspicious-call-argument)
345+
// NOLINTNEXTLINE(readability-suspicious-call-argument)
346+
adder(first_plus_second, third, visitor);
348347
});
349348
});
350349

0 commit comments

Comments
 (0)