diff --git a/cmake/common/clang-tidy.json b/cmake/common/clang-tidy.json index 49abc79ba..e010d9f31 100644 --- a/cmake/common/clang-tidy.json +++ b/cmake/common/clang-tidy.json @@ -1,5 +1,5 @@ { - "Checks": "-*, bugprone-*, -bugprone-easily-swappable-parameters,-bugprone-unchecked-optional-access, concurrency-*, modernize-*, performance-*, portability-*", + "Checks": "-*, bugprone-*, -bugprone-unchecked-optional-access, concurrency-*, modernize-*, performance-*, portability-*", "WarningsAsErrors": "*", "FormatStyle": "none", "UseColor": true diff --git a/src/core/json/include/sourcemeta/core/json_error.h b/src/core/json/include/sourcemeta/core/json_error.h index 53ec4b732..ba810667d 100644 --- a/src/core/json/include/sourcemeta/core/json_error.h +++ b/src/core/json/include/sourcemeta/core/json_error.h @@ -25,10 +25,12 @@ namespace sourcemeta::core { class SOURCEMETA_CORE_JSON_EXPORT JSONParseError : public std::exception { public: /// Create a parsing error + // NOLINTNEXTLINE(bugprone-easily-swappable-parameters) JSONParseError(const std::uint64_t line, const std::uint64_t column) : line_{line}, column_{column} {} /// Create a parsing error with a custom error + // NOLINTNEXTLINE(bugprone-easily-swappable-parameters) JSONParseError(const std::uint64_t line, const std::uint64_t column, std::string message) : line_{line}, column_{column}, message_{std::move(message)} {} diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h index 1442d3e1f..f11797b82 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h @@ -536,6 +536,7 @@ template class GenericPointer { /// sourcemeta::core::Pointer{"qux", "baz"}); /// ``` [[nodiscard]] auto + // NOLINTNEXTLINE(bugprone-easily-swappable-parameters) rebase(const GenericPointer &prefix, const GenericPointer &replacement) const -> GenericPointer { diff --git a/src/core/jsonschema/frame.cc b/src/core/jsonschema/frame.cc index 183c4dc61..c55d4902e 100644 --- a/src/core/jsonschema/frame.cc +++ b/src/core/jsonschema/frame.cc @@ -407,11 +407,13 @@ auto SchemaFrame::to_json() const -> JSON { return root; } -auto SchemaFrame::analyse(const JSON &root, const SchemaWalker &walker, - const SchemaResolver &resolver, - const std::optional &default_dialect, - const std::optional &default_id, - const SchemaFrame::Paths &paths) -> void { +auto SchemaFrame::analyse( + const JSON &root, const SchemaWalker &walker, + const SchemaResolver &resolver, + // NOLINTNEXTLINE(bugprone-easily-swappable-parameters) + const std::optional &default_dialect, + const std::optional &default_id, + const SchemaFrame::Paths &paths) -> void { std::vector subschema_entries; std::map subschemas; std::map> base_uris; diff --git a/src/core/jsonschema/jsonschema.cc b/src/core/jsonschema/jsonschema.cc index 0c523e084..21a63dff3 100644 --- a/src/core/jsonschema/jsonschema.cc +++ b/src/core/jsonschema/jsonschema.cc @@ -70,6 +70,7 @@ static auto id_keyword(const std::string &base_dialect) -> std::string { auto sourcemeta::core::identify( const sourcemeta::core::JSON &schema, const SchemaResolver &resolver, const SchemaIdentificationStrategy strategy, + // NOLINTNEXTLINE(bugprone-easily-swappable-parameters) const std::optional &default_dialect, const std::optional &default_id) -> std::optional { diff --git a/src/core/jsonschema/walker.cc b/src/core/jsonschema/walker.cc index 1e19a2602..cea64f756 100644 --- a/src/core/jsonschema/walker.cc +++ b/src/core/jsonschema/walker.cc @@ -14,6 +14,7 @@ auto walk(const std::optional &parent, const sourcemeta::core::JSON &subschema, const sourcemeta::core::SchemaWalker &walker, const sourcemeta::core::SchemaResolver &resolver, + // NOLINTNEXTLINE(bugprone-easily-swappable-parameters) const std::string &dialect, const std::string &base_dialect, const SchemaWalkerType_t type, const std::size_t level, const bool orphan) -> void { diff --git a/src/core/regex/include/sourcemeta/core/regex.h b/src/core/regex/include/sourcemeta/core/regex.h index 10fc44ac2..c9b2e2706 100644 --- a/src/core/regex/include/sourcemeta/core/regex.h +++ b/src/core/regex/include/sourcemeta/core/regex.h @@ -217,6 +217,7 @@ auto matches(const Regex ®ex, const T &value) -> bool { /// assert(sourcemeta::core::matches_if_valid("^foo", "foo bar")); /// ``` template +// NOLINTNEXTLINE(bugprone-easily-swappable-parameters) auto matches_if_valid(const T &pattern, const T &value) -> bool { const auto regex{to_regex(pattern)}; return regex.has_value() && matches(regex.value(), value); diff --git a/src/core/uri/uri.cc b/src/core/uri/uri.cc index 7744e87b2..eec9d6aa8 100644 --- a/src/core/uri/uri.cc +++ b/src/core/uri/uri.cc @@ -641,6 +641,7 @@ auto URI::relative_to(const URI &base) -> URI & { return *this; } +// NOLINTNEXTLINE(bugprone-easily-swappable-parameters) auto URI::rebase(const URI &base, const URI &new_base) -> URI & { this->relative_to(base); if (!this->is_relative()) {