From af2cd8e64d90308f71007198c63a51be6a5937dc Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:47:25 +0000 Subject: [PATCH] ci: Bump `TIDY_LLVM_V` This change switches to the latest IWYU 0.22, which is compatible with Clang 18. --- ci/test/00_setup_env_native_tidy.sh | 2 +- src/script/signingprovider.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/test/00_setup_env_native_tidy.sh b/ci/test/00_setup_env_native_tidy.sh index c12044f461d85..a5ba64da15d2b 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/script/signingprovider.cpp b/src/script/signingprovider.cpp index 0031f94af1138..baabd4d5b5cc8 100644 --- a/src/script/signingprovider.cpp +++ b/src/script/signingprovider.cpp @@ -370,8 +370,6 @@ TaprootBuilder& TaprootBuilder::Add(int depth, Span 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(script.begin(), script.end()), leaf_version, {}}); /* Insert into the branch. */ Insert(std::move(node), depth);