Merge branch 'rc' into v2

condition/condition.go

@@ -49,9 +49,7 @@ func Or[T, U any](a T, b U) bool {
 // Xor returns true if a or b but not both is truthy.
 // Play: https://go.dev/play/p/gObZrW7ZbG8
 func Xor[T, U any](a T, b U) bool {
-	valA := Bool(a)
-	valB := Bool(b)
-	return (valA || valB) && valA != valB
+	return Bool(a) != Bool(b)
 }
 
 // Nor returns true if neither a nor b is truthy.
@@ -63,9 +61,7 @@ func Nor[T, U any](a T, b U) bool {
 // Xnor returns true if both a and b or neither a nor b are truthy.
 // Play: https://go.dev/play/p/OuDB9g51643
 func Xnor[T, U any](a T, b U) bool {
-	valA := Bool(a)
-	valB := Bool(b)
-	return (valA && valB) || (!valA && !valB)
+	return Bool(a) == Bool(b)
 }
 
 // Nand returns false if both a and b are truthy.

formatter/byte.go

@@ -84,13 +84,26 @@ var (
 // The precision parameter specifies the number of digits after the decimal point, which defaults to 4.
 // Play: https://go.dev/play/p/FPXs1suwRcs
 func DecimalBytes(size float64, precision ...int) string {
-	p := 5
+	pointPosition := 4
 	if len(precision) > 0 {
-		p = precision[0] + 1
+		pointPosition = precision[0]
 	}
+
 	size, unit := calculateByteSize(size, 1000.0, decimalByteUnits)
 
-	return fmt.Sprintf("%.*g%s", p, size, unit)
+	format := fmt.Sprintf("%%.%df", pointPosition)
+	bytes := fmt.Sprintf(format, size)
+
+	for i := len(bytes); i > 0; i-- {
+		s := bytes[i-1]
+		if s != '0' && s != '.' {
+			break
+		}
+
+		bytes = bytes[:i-1]
+	}
+
+	return bytes + unit
 }
 
 // BinaryBytes returns a human-readable byte size under binary standard (base 1024)

formatter/byte_test.go

@@ -20,6 +20,11 @@ func TestDecimalBytes(t *testing.T) {
 	assert.Equal("3.123PB", DecimalBytes(float64(3.123*UnitPB)))
 	assert.Equal("4.123EB", DecimalBytes(float64(4.123*UnitEB)))
 	assert.Equal("1EB", DecimalBytes(float64(1000*UnitPB)))
+	assert.Equal("62MB", DecimalBytes(61812496, 0))
+	assert.Equal("61.8MB", DecimalBytes(61812496, 1))
+	assert.Equal("401MB", DecimalBytes(401000000))
+	assert.Equal("401MB", DecimalBytes(401000000, 0))
+	assert.Equal("4MB", DecimalBytes(4010000, 0))
 }
 
 func TestBinaryBytes(t *testing.T) {