diff options
| author | fanquake <fanquake@gmail.com> | 2024-03-18 15:10:21 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-03-18 15:10:31 +0000 |
| commit | aba9024c0cb50300dc6bd67e4d96ea927261b3d3 (patch) | |
| tree | 060c85d36ac62ae9af27f2faa43fbda5a3fd065b | |
| parent | 7af95afa8bc3f36a37d082ef3475cb3e0bd3a0e4 (diff) | |
| parent | 636c9862cfc8b3facc84eb62b51e18877f2022a9 (diff) | |
Merge bitcoin/bitcoin#29659: ci: Bump `TIDY_LLVM_V`
636c9862cfc8b3facc84eb62b51e18877f2022a9 ci: Bump `TIDY_LLVM_V` (Hennadii Stepanov)
Pull request description:
This PR switches to the latest [IWYU 0.22](https://github.com/include-what-you-use/include-what-you-use/releases/tag/0.22), which is compatible with Clang 18.
ACKs for top commit:
fanquake:
ACK 636c9862cfc8b3facc84eb62b51e18877f2022a9
Tree-SHA512: 78ce89244c5e487dd1be8b4bd2ca6f06d19b04b78289ebc21985110574053545dcce5eb622edf2bede2cf7bb58360170e976d30a4484a127d34dd17b1c604e9c
| -rwxr-xr-x | ci/test/00_setup_env_native_tidy.sh | 2 | ||||
| -rw-r--r-- | src/.clang-tidy | 1 | ||||
| -rw-r--r-- | src/script/signingprovider.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/ci/test/00_setup_env_native_tidy.sh b/ci/test/00_setup_env_native_tidy.sh index c12044f461..a5ba64da15 100755 --- a/ci/test/00_setup_env_native_tidy.sh +++ b/ci/test/00_setup_env_native_tidy.sh @@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8 export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04" export CONTAINER_NAME=ci_native_tidy -export TIDY_LLVM_V="17" +export TIDY_LLVM_V="18" export PACKAGES="clang-${TIDY_LLVM_V} libclang-${TIDY_LLVM_V}-dev llvm-${TIDY_LLVM_V}-dev libomp-${TIDY_LLVM_V}-dev clang-tidy-${TIDY_LLVM_V} jq bear libevent-dev libboost-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev systemtap-sdt-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libqrencode-dev libsqlite3-dev libdb++-dev" export NO_DEPENDS=1 export RUN_UNIT_TESTS=false diff --git a/src/.clang-tidy b/src/.clang-tidy index bfaa5ab8e7..e4b789dcaa 100644 --- a/src/.clang-tidy +++ b/src/.clang-tidy @@ -12,6 +12,7 @@ modernize-use-noexcept, modernize-use-nullptr, performance-*, -performance-avoid-endl, +-performance-enum-size, -performance-inefficient-string-concatenation, -performance-no-int-to-ptr, -performance-noexcept-move-constructor, diff --git a/src/script/signingprovider.cpp b/src/script/signingprovider.cpp index 0031f94af1..baabd4d5b5 100644 --- a/src/script/signingprovider.cpp +++ b/src/script/signingprovider.cpp @@ -370,8 +370,6 @@ TaprootBuilder& TaprootBuilder::Add(int depth, Span<const unsigned char> script, /* Construct NodeInfo object with leaf hash and (if track is true) also leaf information. */ NodeInfo node; node.hash = ComputeTapleafHash(leaf_version, script); - // due to bug in clang-tidy-17: - // NOLINTNEXTLINE(modernize-use-emplace) if (track) node.leaves.emplace_back(LeafInfo{std::vector<unsigned char>(script.begin(), script.end()), leaf_version, {}}); /* Insert into the branch. */ Insert(std::move(node), depth); |