Merge pull request #354 from NathanReb/fmt-0-9

Replace uses of deprecated fmt functions

Author: NathanReb

bin/pp.ml

@@ -46,7 +46,7 @@ let run (`Setup ()) (`File file) (`Section section) =
           | Block b ->
               if not (Mdx.Block.skip b) then (
                 Log.debug (fun l -> l "pp: %a" Mdx.Block.dump b);
-                let pp_lines = Fmt.(list ~sep:(unit "\n") string) in
+                let pp_lines = Fmt.(list ~sep:(any "\n") string) in
                 let contents = Mdx.Block.executable_contents ~syntax:Normal b in
                 match b.value with
                 | Toplevel _ -> Fmt.pr "%a\n" pp_lines contents

dune-project

@@ -22,7 +22,7 @@
   (ocaml
    (>= 4.08.0))
   ocamlfind
-  (fmt (>= 0.8.5))
+  (fmt (>= 0.8.7))
   (cppo :build)
   (csexp
    (>= 1.3.2))

lib/block.ml

@@ -128,7 +128,7 @@ let pp_lines syntax t =
         fun ppf -> Fmt.fmt "%*s%s" ppf (t.loc.loc_start.pos_cnum + 2) ""
     | _ -> Fmt.string
   in
-  Fmt.(list ~sep:(unit "\n") pp)
+  Fmt.(list ~sep:(any "\n") pp)
 
 let lstrip string =
   let hpad = Misc.hpad_of_lines [ string ] in
@@ -160,11 +160,11 @@ let pp_footer ?syntax ppf t =
 
 let pp_legacy_labels ppf = function
   | [] -> ()
-  | l -> Fmt.pf ppf " %a" Fmt.(list ~sep:(unit ",") Label.pp) l
+  | l -> Fmt.pf ppf " %a" Fmt.(list ~sep:(any ",") Label.pp) l
 
 let pp_labels ppf = function
   | [] -> ()
-  | l -> Fmt.pf ppf "<!-- $MDX %a -->\n" Fmt.(list ~sep:(unit ",") Label.pp) l
+  | l -> Fmt.pf ppf "<!-- $MDX %a -->\n" Fmt.(list ~sep:(any ",") Label.pp) l
 
 let pp_header ?syntax ppf t =
   match syntax with

lib/document.ml

@@ -30,7 +30,7 @@ let pp_line ?syntax ppf (l : line) =
       | _ -> Fmt.pf ppf "%s\n" s)
 
 let pp ?syntax ppf t =
-  Fmt.pf ppf "%a\n" Fmt.(list ~sep:(unit "\n") (pp_line ?syntax)) t
+  Fmt.pf ppf "%a\n" Fmt.(list ~sep:(any "\n") (pp_line ?syntax)) t
 
 let to_string = Fmt.to_to_string pp
 

lib/misc.ml

@@ -29,7 +29,7 @@ let pp_pad ppf = function
   | 0 -> ()
   | i -> Fmt.string ppf (String.v ~len:i (fun _ -> ' '))
 
-let pp_lines pp = Fmt.(list ~sep:(unit "\n") pp)
+let pp_lines pp = Fmt.(list ~sep:(any "\n") pp)
 
 let dump_string ppf s = Fmt.pf ppf "%S" s
 
@@ -55,4 +55,4 @@ let pp_position ppf lexbuf =
 
 (* TODO: better error reporting *)
 let err lexbuf fmt =
-  Fmt.kstrf (fun str -> Fmt.failwith "%a: %s" pp_position lexbuf str) fmt
+  Fmt.kstr (fun str -> Fmt.failwith "%a: %s" pp_position lexbuf str) fmt

lib/test/mdx_test.ml

@@ -127,9 +127,9 @@ let eval_test ?block ?root c cmd =
 
 let err_eval ~cmd lines =
   Fmt.epr "Got an error while evaluating:\n---\n%a\n---\n%a\n%!"
-    Fmt.(list ~sep:(unit "\n") string)
+    Fmt.(list ~sep:(any "\n") string)
     cmd
-    Fmt.(list ~sep:(unit "\n") string)
+    Fmt.(list ~sep:(any "\n") string)
     lines;
   exit 1
 

mdx.opam

@@ -21,7 +21,7 @@ depends: [
   "dune" {>= "2.7"}
   "ocaml" {>= "4.08.0"}
   "ocamlfind"
-  "fmt" {>= "0.8.5"}
+  "fmt" {>= "0.8.7"}
   "cppo" {build}
   "csexp" {>= "1.3.2"}
   "astring"