From 5671175a5e59e22d4d7775a3909534630d43c1ec Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 1 Apr 2025 15:33:01 +0200 Subject: [PATCH] Format clang-format: 18.1.8 -> 19.1.7 (cherry picked from commit 55297f865c9dc938dc6c9a76ea68dd527f2ba2a8) # Conflicts: # src/libstore-test-support/outputs-spec.cc --- src/libfetchers/git-lfs-fetch.cc | 9 ++++---- src/libstore-test-support/outputs-spec.cc | 27 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 src/libstore-test-support/outputs-spec.cc diff --git a/src/libfetchers/git-lfs-fetch.cc b/src/libfetchers/git-lfs-fetch.cc index bd6c01435..674b46ee2 100644 --- a/src/libfetchers/git-lfs-fetch.cc +++ b/src/libfetchers/git-lfs-fetch.cc @@ -44,10 +44,11 @@ static void downloadToSink( static std::string getLfsApiToken(const ParsedURL & url) { - auto [status, output] = runProgram(RunOptions{ - .program = "ssh", - .args = {*url.authority, "git-lfs-authenticate", url.path, "download"}, - }); + auto [status, output] = runProgram( + RunOptions{ + .program = "ssh", + .args = {*url.authority, "git-lfs-authenticate", url.path, "download"}, + }); if (output.empty()) throw Error( diff --git a/src/libstore-test-support/outputs-spec.cc b/src/libstore-test-support/outputs-spec.cc new file mode 100644 index 000000000..04b243738 --- /dev/null +++ b/src/libstore-test-support/outputs-spec.cc @@ -0,0 +1,27 @@ +#include "nix/tests/outputs-spec.hh" + +#include + +namespace rc { +using namespace nix; + +Gen Arbitrary::arbitrary() +{ + return gen::mapcat( + gen::inRange(0, std::variant_size_v), [](uint8_t n) -> Gen { + switch (n) { + case 0: + return gen::just((OutputsSpec) OutputsSpec::All{}); + case 1: + return gen::map( + gen::nonEmpty( + gen::container( + gen::map(gen::arbitrary(), [](StorePathName n) { return n.name; }))), + [](StringSet names) { return (OutputsSpec) OutputsSpec::Names{names}; }); + default: + assert(false); + } + }); +} + +}