upstream: https://github.com/mirage/ocaml-gpt
claude: complete Err -> Error module rename across call sites
Follow up to the module rename: update the remaining callers that
still referenced [Err] (library [claude.ml{,i}], [client.ml], the test
driver [test.ml]), and fix one stray [^ e] string concatenation in
hermest's CLI that needed [Json.Error.to_string e] now that
[Json.of_string] yields a structured error.
+5
-15
-1
c/dune
-1
c/dune
-1
fuzz/dune
-1
fuzz/dune
+1
-2
lib/dune
+1
-2
lib/dune
+4
-11
test/test_gpt.ml
+4
-11
test/test_gpt.ml
···
226
226
in
227
227
let partition_table_len = String.length partition_table_str in
228
228
match Gpt.of_string header_str ~sector_size:512 with
229
-
| Error e ->
230
-
Alcotest.failf "Failed to parse marshalled gpt header: %s"
231
-
e
229
+
| Error e -> Alcotest.failf "Failed to parse marshalled gpt header: %s" e
232
230
| Ok (`Read_partition_table (_lba, sectors), k) -> (
233
231
Fmt.pr "expected %d, got %d\n%!" (partition_table_len / 512) sectors;
234
232
Alcotest.(check int)
···
237
235
sectors;
238
236
match k (Bytes.of_string partition_table_str) with
239
237
| Error e ->
240
-
Alcotest.failf "Failed to parse marshalled partition table: %s"
241
-
e
238
+
Alcotest.failf "Failed to parse marshalled partition table: %s" e
242
239
| Ok unmarshalled ->
243
240
Alcotest.check gpt "unmarshalled equal to original" morig unmarshalled
244
241
)
···
539
536
| Error e -> Alcotest.failf "header parse failed: %s" e
540
537
| Ok (`Read_partition_table (_, _), k) -> (
541
538
match k (Bytes.of_string pt_str) with
542
-
| Error e ->
543
-
Alcotest.failf "partition table parse failed: %s"
544
-
e
539
+
| Error e -> Alcotest.failf "partition table parse failed: %s" e
545
540
| Ok gpt' ->
546
541
Alcotest.(check int32)
547
542
"header_crc32 preserved" gpt.Gpt.header_crc32 gpt'.Gpt.header_crc32;
···
599
594
Alcotest.(check int64)
600
595
"partition starts at first_usable_lba" fula
601
596
(List.hd gpt.Gpt.partitions).Gpt.Partition.starting_lba
602
-
| Error e ->
603
-
Alcotest.failf "partition at first_usable_lba should work: %s"
604
-
e
597
+
| Error e -> Alcotest.failf "partition at first_usable_lba should work: %s" e
605
598
606
599
let first_usable_lba_test_collection =
607
600
[