Skip to content

Commit e7ee341

Browse files
committed
try to fix remaining annotations
Signed-off-by: Jared Van Bortel <[email protected]>
1 parent f1025be commit e7ee341

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.clang-tidy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Checks:
4949
- '-cppcoreguidelines-pro-type-member-init'
5050
- '-cppcoreguidelines-pro-type-reinterpret-cast'
5151
- '-cppcoreguidelines-pro-type-static-cast-downcast'
52+
- '-cppcoreguidelines-pro-type-union-access'
5253
- '-cppcoreguidelines-pro-type-vararg'
5354
- '-cppcoreguidelines-rvalue-reference-param-not-moved'
5455
- '-cppcoreguidelines-special-member-functions'
@@ -71,6 +72,7 @@ Checks:
7172
- '-modernize-avoid-bind'
7273
- '-modernize-deprecated-headers'
7374
- '-modernize-loop-convert'
75+
- '-modernize-pass-by-value'
7476
- '-modernize-raw-string-literal'
7577
- '-modernize-return-braced-init-list'
7678
- '-modernize-use-auto'
@@ -103,6 +105,7 @@ Checks:
103105
- '-readability-identifier-length'
104106
- '-readability-implicit-bool-conversion'
105107
- '-readability-inconsistent-declaration-parameter-name'
108+
- '-readability-isolate-declaration'
106109
- '-readability-math-missing-parentheses'
107110
- '-readability-named-parameter'
108111
- '-readability-non-const-parameter'

.github/workflows/cpp-linter.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ jobs:
5151
id: linter
5252
with:
5353
style: '' # no clang-format
54-
extensions: 'c,cpp,h,inl'
54+
extensions: 'c,cpp'
5555
tidy-checks: '' # use .clang-tidy config
5656
database: gpt4all-chat/build
5757
version: 18
58-
files-changed-only: false # TODO: set this back to true
59-
ignore: 'gpt4all-chat/build/_deps'
58+
files-changed-only: false
59+
ignore: 'gpt4all-chat/build/_deps|gpt4all-bindings'
6060
- name: Fail Fast
6161
if: steps.linter.outputs.clang-tidy-checks-failed > 0
6262
run: exit 1

gpt4all-backend/src/llamamodel_impl.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66

77
#include "llmodel.h"
88

9+
#include <expected>
910
#include <memory>
1011
#include <span>
1112
#include <string>
1213
#include <string_view>
13-
#include <vector>
1414
#include <unordered_map>
15+
#include <vector>
1516

1617
struct LLamaPrivate;
1718
struct EmbModelSpec;

0 commit comments

Comments
 (0)