nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-22 14:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build failure with clang

Browse Source 
A slight issue with feb1d10f60.
This commit is contained in:
John Ericson 2024-05-06 13:38:21 -04:00
parent 2926ef0e90
commit 5e189025ca
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libfetchers/fetchers.hh
View File

@ -230,6 +230,8 @@ struct PublicKey
{ {
std::string type = "ssh-ed25519"; std::string type = "ssh-ed25519";
std::string key; std::string key;
auto operator <=>(const PublicKey &) const = default;
}; };
std::string publicKeys_to_string(const std::vector<PublicKey>&); std::string publicKeys_to_string(const std::vector<PublicKey>&);

4
tests/unit/libfetchers/public-key.cc
View File

@ -22,7 +22,7 @@ public:
TEST_F(FIXTURE, PublicKey_ ## NAME ## _from_json) { \ TEST_F(FIXTURE, PublicKey_ ## NAME ## _from_json) { \
readTest(#NAME ".json", [&](const auto & encoded_) { \ readTest(#NAME ".json", [&](const auto & encoded_) { \
fetchers::PublicKey expected { VAL }; \ fetchers::PublicKey expected { VAL }; \
auto got = nlohmann::json::parse(encoded_); \ fetchers::PublicKey got = nlohmann::json::parse(encoded_); \
ASSERT_EQ(got, expected); \ ASSERT_EQ(got, expected); \
}); \ }); \
} \ } \
@ -47,7 +47,7 @@ TEST_F(PublicKeyTest, PublicKey_noRoundTrip_from_json) {
readTest("noRoundTrip.json", [&](const auto & encoded_) { readTest("noRoundTrip.json", [&](const auto & encoded_) {
fetchers::PublicKey expected = { .type = "ssh-ed25519", .key = "ABCDE" }; fetchers::PublicKey expected = { .type = "ssh-ed25519", .key = "ABCDE" };
fetchers::PublicKey got = nlohmann::json::parse(encoded_); fetchers::PublicKey got = nlohmann::json::parse(encoded_);
ASSERT_EQ(got, nlohmann::json(expected)); ASSERT_EQ(got, expected);
}); });
} }