Merge pull request #9858 from Leonidas-from-XIV/update-re

chore: Update re

Author: Leonidas-from-XIV

src/dune_patch/dune_patch.ml

@@ -1,14 +1,5 @@
 open Stdune
-
-module Re = struct
-  include Dune_re
-
-  module Group = struct
-    include Group
-
-    let get_opt group n = if Group.test group n then Some (get group n) else None
-  end
-end
+module Re = Dune_re
 
 include struct
   open Dune_engine

vendor/re/src/automata.ml

@@ -254,11 +254,11 @@ module E = struct
     | TSeq (l', x, _kind) ->
       Format.fprintf ch "@[<2>(Seq@ ";
       print_state_lst ch l' x;
-      Format.fprintf ch " %a)@]" pp x
+      Format.fprintf ch "@ %a)@]" pp x
     | TExp (marks, {def = Eps; _}) ->
-      Format.fprintf ch "(Exp %d (%a) (eps))" y.id Marks.pp_marks marks
+      Format.fprintf ch "@[<2>(Exp@ %d@ (%a)@ (eps))@]" y.id Marks.pp_marks marks
     | TExp (marks, x) ->
-      Format.fprintf ch "(Exp %d (%a) %a)" x.id Marks.pp_marks marks pp x
+      Format.fprintf ch "@[<2>(Exp@ %d@ (%a)@ %a)@]" x.id Marks.pp_marks marks pp x
 
   and print_state_lst ch l y =
     match l with
@@ -268,7 +268,7 @@ module E = struct
       print_state_rec ch e y;
       List.iter
         (fun e ->
-           Format.fprintf ch " | ";
+           Format.fprintf ch "@ | ";
            print_state_rec ch e y)
         rem
 

vendor/re/src/color_map.ml

@@ -24,7 +24,7 @@ let flatten cm =
     Bytes.set c i (Char.chr !v);
     Bytes.set color_repr !v (Char.chr i)
   done;
-  (c, Bytes.sub color_repr 0 (!v + 1), !v + 1)
+  (Bytes.unsafe_to_string c, Bytes.sub_string color_repr 0 (!v + 1), !v + 1)
 
 (* mark all the endpoints of the intervals of the char set with the 1 byte *)
 let split s cm =

vendor/re/src/color_map.mli

@@ -9,6 +9,6 @@ type t
 
 val make : unit -> t
 
-val flatten : t -> bytes * bytes * int
+val flatten : t -> string * string * int
 
 val split : Cset.t -> t -> unit