diff --git a/dune-workspace b/dune-workspace deleted file mode 100644 index efb20ab..0000000 --- a/dune-workspace +++ /dev/null @@ -1,5 +0,0 @@ -(lang dune 2.0) - -(env - (dev - (flags (:standard -warn-error -A)))) diff --git a/src/lib/monorepo/git_store.ml b/src/lib/monorepo/git_store.ml index 0c98cb0..cefb4b9 100644 --- a/src/lib/monorepo/git_store.ml +++ b/src/lib/monorepo/git_store.ml @@ -145,7 +145,7 @@ end let id_of_repo repo = let pp_hex f d = - for x = 0 to Cstruct.len d - 1 do + for x = 0 to Cstruct.length d - 1 do let byte = Cstruct.get_uint8 d x in Fmt.pf f "%02x" byte done diff --git a/src/lib/monorepo/opamfile.ml b/src/lib/monorepo/opamfile.ml index c4aaff0..09c34e2 100644 --- a/src/lib/monorepo/opamfile.ml +++ b/src/lib/monorepo/opamfile.ml @@ -1,8 +1,9 @@ -type t = OpamParserTypes.opamfile +type t = OpamParserTypes.FullPos.opamfile type pkg = { name : string; version : string; repo : string } let get_packages (opam_file : t) = let open OpamParserTypes in + let opam_file = OpamParser.FullPos.to_opamfile opam_file in let pin_depends = List.find_map (function @@ -26,11 +27,11 @@ let get_packages (opam_file : t) = | List (_, v) -> v | _ -> failwith "failed to parse opam") -let marshal = OpamPrinter.opamfile -let unmarshal t = OpamParser.string t "monorepo.opam" +let marshal = OpamPrinter.FullPos.opamfile +let unmarshal t = OpamParser.FullPos.string t "monorepo.opam" let digest x = marshal x |> Digest.string |> Digest.to_hex -let to_yojson f = `String (OpamPrinter.opamfile f) +let to_yojson f = `String (OpamPrinter.FullPos.opamfile f) let of_yojson = function - | `String s -> Ok (OpamParser.string s "") + | `String s -> Ok (OpamParser.FullPos.string s "") | _ -> Error "failed to parse opamfile" diff --git a/src/lib/monorepo/opamfile.mli b/src/lib/monorepo/opamfile.mli index d2ca8e8..e7d2cc4 100644 --- a/src/lib/monorepo/opamfile.mli +++ b/src/lib/monorepo/opamfile.mli @@ -1,4 +1,4 @@ -type t = OpamParserTypes.opamfile +type t = OpamParserTypes.FullPos.opamfile type pkg = { name : string; version : string; repo : string } val get_packages : t -> pkg list