Replace the Error() object with an error() function which takes fmt

formatspecs, making for much cleaner code. Reformatted everything. This actually happened in multiple steps but then I corrupted my local repository and I had to recover from the working tree.
2025-10-31 11:17:01 -07:00 · 2023-05-09 20:59:44 +00:00
parent bfa0846ad0
commit 466c3c34e5
168 changed files with 5722 additions and 5135 deletions
--- a/tests/bytes.cc
+++ b/tests/bytes.cc
@@ -38,7 +38,7 @@ static void test_loop()
    Bytes b = {1, 2, 3, 4};

    std::vector<uint8_t> v(b.begin(), b.end());
-    assert((v == std::vector<uint8_t>{ 1, 2, 3, 4 }));
+    assert((v == std::vector<uint8_t>{1, 2, 3, 4}));

    unsigned sum = 0;
    for (uint8_t i : b)
@@ -70,10 +70,14 @@ static void test_reads()
    assert(br.read_8() == 0x01);
    assert(br.read_8() == 0x02);

-    br.seek(0); assert(br.read_be24() == 0x010203);
-    br.seek(0); assert(br.read_le24() == 0x030201);
-    br.seek(0); assert(br.read_be32() == 0x01020304);
-    br.seek(0); assert(br.read_le32() == 0x04030201);
+    br.seek(0);
+    assert(br.read_be24() == 0x010203);
+    br.seek(0);
+    assert(br.read_le24() == 0x030201);
+    br.seek(0);
+    assert(br.read_be32() == 0x01020304);
+    br.seek(0);
+    assert(br.read_le32() == 0x04030201);
 }

 static void test_writes()
@@ -83,22 +87,38 @@ static void test_writes()

    bw.seek(0);
    bw.write_8(1);
-    assert((b == Bytes{ 1 }));
+    assert((b == Bytes{1}));
    bw.write_be32(0x02020202);
-    assert((b == Bytes{ 1, 2, 2, 2, 2 }));
+    assert((b == Bytes{1, 2, 2, 2, 2}));

-    auto reset = [&]() { b.resize(0); bw.seek(0); };
-
-    reset(); bw.write_le16(0x0102); assert((b == Bytes{ 2, 1 }));
-    reset(); bw.write_be16(0x0102); assert((b == Bytes{ 1, 2 }));
-    reset(); bw.write_le24(0x010203); assert((b == Bytes{ 3, 2, 1 }));
-    reset(); bw.write_be24(0x010203); assert((b == Bytes{ 1, 2, 3 }));
-    reset(); bw.write_le32(0x01020304); assert((b == Bytes{ 4, 3, 2, 1 }));
-    reset(); bw.write_be32(0x01020304); assert((b == Bytes{ 1, 2, 3, 4 }));
+    auto reset = [&]()
+    {
+        b.resize(0);
+        bw.seek(0);
+    };

    reset();
-    bw += { 1, 2, 3, 4, 5 };
-    assert((b == Bytes{ 1, 2, 3, 4, 5 }));
+    bw.write_le16(0x0102);
+    assert((b == Bytes{2, 1}));
+    reset();
+    bw.write_be16(0x0102);
+    assert((b == Bytes{1, 2}));
+    reset();
+    bw.write_le24(0x010203);
+    assert((b == Bytes{3, 2, 1}));
+    reset();
+    bw.write_be24(0x010203);
+    assert((b == Bytes{1, 2, 3}));
+    reset();
+    bw.write_le32(0x01020304);
+    assert((b == Bytes{4, 3, 2, 1}));
+    reset();
+    bw.write_be32(0x01020304);
+    assert((b == Bytes{1, 2, 3, 4}));
+
+    reset();
+    bw += {1, 2, 3, 4, 5};
+    assert((b == Bytes{1, 2, 3, 4, 5}));
 }

 static void test_slice()
@@ -106,75 +126,63 @@ static void test_slice()
    Bytes b = {1, 2, 3};

    Bytes bs = b.slice(1, 1);
-    assert((bs == Bytes{ 2 }));
+    assert((bs == Bytes{2}));

    bs = b.slice(1, 2);
-    assert((bs == Bytes{ 2, 3 }));
+    assert((bs == Bytes{2, 3}));

    bs = b.slice(1, 3);
-    assert((bs == Bytes{ 2, 3, 0 }));
-    
+    assert((bs == Bytes{2, 3, 0}));
+
    bs = b.slice(4, 2);
-    assert((bs == Bytes{ 0, 0 }));
+    assert((bs == Bytes{0, 0}));
 }

 static void test_split()
 {
-	AssertThat(
-		(Bytes{ }).split(0),
-		Equals(std::vector<Bytes> {
-			Bytes{}
-		}));
+    AssertThat((Bytes{}).split(0), Equals(std::vector<Bytes>{Bytes{}}));

-	AssertThat(
-		(Bytes{ 0 }).split(0),
-		Equals(std::vector<Bytes> {
-			Bytes{},
-			Bytes{}
-		}));
+    AssertThat(
+        (Bytes{0}).split(0), Equals(std::vector<Bytes>{Bytes{}, Bytes{}}));

-	AssertThat(
-		(Bytes{ 1 }).split(0),
-		Equals(std::vector<Bytes> {
-			Bytes{ 1 }
-		}));
+    AssertThat((Bytes{1}).split(0), Equals(std::vector<Bytes>{Bytes{1}}));

-	AssertThat(
-		(Bytes{ 1, 0 }).split(0),
-		Equals(std::vector<Bytes> {
-			Bytes{ 1 },
-			Bytes{ }
-		}));
+    AssertThat(
+        (Bytes{1, 0}).split(0), Equals(std::vector<Bytes>{Bytes{1}, Bytes{}}));

-	AssertThat(
-		(Bytes{ 0, 1 }).split(0),
-		Equals(std::vector<Bytes> {
-			Bytes{ },
-			Bytes{ 1 }
-		}));
+    AssertThat(
+        (Bytes{0, 1}).split(0), Equals(std::vector<Bytes>{Bytes{}, Bytes{1}}));

-	AssertThat(
-		(Bytes{ 1, 0, 1 }).split(0),
-		Equals(std::vector<Bytes> {
-			Bytes{ 1 },
-			Bytes{ 1 }
-		}));
+    AssertThat((Bytes{1, 0, 1}).split(0),
+        Equals(std::vector<Bytes>{Bytes{1}, Bytes{1}}));
 }

 static void test_tobits()
 {
-	Bytes b = {1, 2};
-	assert(b.toBits() == (std::vector<bool>{
-		false, false, false, false, false, false, false, true,
-		false, false, false, false, false, false, true, false
-	}));
+    Bytes b = {1, 2};
+    assert(b.toBits() == (std::vector<bool>{false,
+                             false,
+                             false,
+                             false,
+                             false,
+                             false,
+                             false,
+                             true,
+                             false,
+                             false,
+                             false,
+                             false,
+                             false,
+                             false,
+                             true,
+                             false}));
 }

 static void test_tostring()
 {
-	std::string s = "Hello, world";
-	Bytes b(s);
-	assert(b == s);
+    std::string s = "Hello, world";
+    Bytes b(s);
+    assert(b == s);
 }

 int main(int argc, const char* argv[])
@@ -185,8 +193,8 @@ int main(int argc, const char* argv[])
    test_reads();
    test_writes();
    test_slice();
-	test_split();
-	test_tobits();
-	test_tostring();
+    test_split();
+    test_tobits();
+    test_tostring();
    return 0;
 }