[stdune] add String.filter_map

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>

src/dune/lib_name.ml

@@ -31,17 +31,15 @@ module Local = struct
       let hint_valid =
         Some
           (fun name ->
-            String.to_seq name
-            |> Seq.filter_map ~f:(fun c ->
-                   if valid_char c then
-                     Some c
-                   else
-                     match c with
-                     | '.'
-                     | '-' ->
-                       Some '_'
-                     | _ -> None)
-            |> String.of_seq)
+            String.filter_map name ~f:(fun c ->
+                if valid_char c then
+                  Some c
+                else
+                  match c with
+                  | '.'
+                  | '-' ->
+                    Some '_'
+                  | _ -> None))
 
       let of_string_opt (name : string) =
         match name with

src/dune/module_name.ml

@@ -28,18 +28,15 @@ include Stringlike.Make (struct
   let hint_valid =
     Some
       (fun name ->
-        String.to_seq name
-        |> Seq.filter_map ~f:(fun c ->
-               if valid_char c then
-                 Some c
-               else
-                 match c with
-                 | '.'
-                 | '-' ->
-                   Some '_'
-                 | _ -> None
-        )
-        |> String.of_seq)
+        String.filter_map name ~f:(fun c ->
+            if valid_char c then
+              Some c
+            else
+              match c with
+              | '.'
+              | '-' ->
+                Some '_'
+              | _ -> None))
 
   let is_valid_module_name name =
     match name with

src/stdune/string.ml

@@ -305,3 +305,7 @@ let of_list chars =
   let s = Bytes.make (List.length chars) '0' in
   List.iteri chars ~f:(fun i c -> Bytes.set s i c);
   Bytes.to_string s
+
+let filter_map t ~f =
+  (* TODO more efficient implementation *)
+  to_seq t |> Seq.filter_map ~f |> of_seq

src/stdune/string.mli

@@ -128,3 +128,5 @@ val need_quoting : string -> bool
 (** [quote_for_shell s] quotes [s] using [Filename.quote] if [need_quoting s] is
     [true] *)
 val quote_for_shell : string -> string
+
+val filter_map : string -> f:(char -> char option) -> string