Update dependencies

dune-project

@@ -1,2 +1,3 @@
-(lang dune 1.0)
+(lang dune 2.0)
 (name prometheus)
+(formatting disabled)

examples/example.ml

@@ -41,8 +41,6 @@ let () =
   Logs.info (fun f -> f "Logging initialised.");
   print_endline "If run with the option --listen-prometheus=9090, this program serves metrics at\n\
                  http://localhost:9090/metrics";
-  let spec = Term.(const main $ Prometheus_unix.opts) in
-  let info = Term.info "example" in
-  match Term.eval (spec, info) with
-  | `Error _ -> exit 1
-  | _ -> exit 0
+  let info = Cmd.info "example" in
+  let cmd = Cmd.v info Term.(const main $ Prometheus_unix.opts) in
+  exit @@ Cmd.eval cmd

prometheus-app.opam

@@ -25,8 +25,8 @@ homepage: "https://github.com/mirage/prometheus"
 doc: "https://mirage.github.io/prometheus/"
 bug-reports: "https://github.com/mirage/prometheus/issues"
 depends: [
-  "ocaml" {>= "4.02.3"}
-  "dune" {>= "1.0"}
+  "ocaml" {>= "4.08"}
+  "dune" {>= "2.0"}
   "prometheus" {= version}
   "fmt" {>= "0.8.7"}
   "re"

prometheus.opam

@@ -8,13 +8,11 @@ doc: "https://mirage.github.io/prometheus/"
 bug-reports: "https://github.com/mirage/prometheus/issues"
 depends: [
   "ocaml" {>= "4.01.0"}
-  "dune"
+  "dune" {>= "2.0"}
   "astring"
   "asetmap"
-  "fmt" {>= "0.8.7"}
   "re"
   "lwt" {>= "2.5.0"}
-  "alcotest" {with-test}
 ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]

src/dune

@@ -1,4 +1,4 @@
 (library
  (name prometheus)
  (public_name prometheus)
- (libraries lwt astring asetmap fmt re))
+ (libraries lwt astring asetmap re))

src/prometheus.ml

@@ -8,7 +8,7 @@ end
 module type NAME = sig
   type t = private string
   val v : string -> t
-  val pp : t Fmt.t
+  val pp : Format.formatter -> t -> unit
   val compare : t -> t -> int
 end
 
@@ -17,12 +17,12 @@ module Name(N : NAME_SPEC) : NAME = struct
 
   let v name =
     if not (Re.execp N.valid name) then
-      failwith (Fmt.str "Invalid name %S" name);
+      failwith (Format.asprintf "Invalid name %S" name);
     name
 
   let compare = String.compare
 
-  let pp = Fmt.string
+  let pp = Format.pp_print_string
 end
 
 let alphabet = Re.(alt [ rg 'a' 'z'; rg 'A' 'Z' ])
@@ -108,7 +108,7 @@ module CollectorRegistry = struct
 
   let register t info collector =
     if MetricFamilyMap.mem info t.metrics
-    then failwith (Fmt.str "%a already registered" MetricName.pp info.MetricInfo.name);
+    then failwith (Format.asprintf "%a already registered" MetricName.pp info.MetricInfo.name);
     t.metrics <- MetricFamilyMap.add info collector t.metrics
 
   let collect t =

src/prometheus.mli

@@ -22,7 +22,7 @@ module type NAME = sig
   val v : string -> t
   (** Raises an exception if the name is not valid. *)
 
-  val pp : t Fmt.t
+  val pp : Format.formatter -> t -> unit
 
   val compare : t -> t -> int
 end

tests/dune

@@ -1,11 +1,4 @@
-(executables
- (names test)
- (libraries prometheus prometheus-app alcotest))
-
-(alias
- (name runtest)
+(test
+ (name test)
  (package prometheus-app)
- (deps
-  (:< test.exe))
- (action
-  (run %{<} -e -v)))
+ (libraries prometheus prometheus-app alcotest))