Merge branch 'main' into use-catch2

1 files changed, 11 insertions, 20 deletions

diff --git a/zenutil/include/zenutil/cache/cachekey.h b/zenutil/include/zenutil/cache/cachekey.h
index aa649b4dc..9adde8fc7 100644
--- a/zenutil/include/zenutil/cache/cachekey.h
+++ b/zenutil/include/zenutil/cache/cachekey.h
@@ -17,28 +17,19 @@ struct CacheKey
 
 	static CacheKey Create(std::string_view Bucket, const IoHash& Hash) { return {.Bucket = ToLower(Bucket), .Hash = Hash}; }
 
-	static const CacheKey Empty;
-};
-
-inline bool
-operator==(const CacheKey& A, const CacheKey& B)
-{
-	return A.Bucket == B.Bucket && A.Hash == B.Hash;
-}
+	auto operator<=>(const CacheKey& that) const
+	{
+		if (auto b = caseSensitiveCompareStrings(Bucket, that.Bucket); b != std::strong_ordering::equal)
+		{
+			return b;
+		}
+		return Hash <=> that.Hash;
+	}
 
-inline bool
-operator!=(const CacheKey& A, const CacheKey& B)
-{
-	return A.Bucket != B.Bucket || A.Hash != B.Hash;
-}
+	auto operator==(const CacheKey& that) const { return (*this <=> that) == std::strong_ordering::equal; }
 
-inline bool
-operator<(const CacheKey& A, const CacheKey& B)
-{
-	const std::string& BucketA = A.Bucket;
-	const std::string& BucketB = B.Bucket;
-	return BucketA == BucketB ? A.Hash < B.Hash : BucketA < BucketB;
-}
+	static const CacheKey Empty;
+};
 
 struct CacheChunkRequest
 {