xapi-stdext-std: Do not include String functions in XStringext

Also remove all indiscriminate opens against it

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Signed-off-by: Pau Ruiz Safont <pau.safont@vates.tech>

Author: psafont

ocaml/database/parse_db_conf.ml

@@ -13,7 +13,6 @@
  *)
 (* !!! This needs to be moved out of xapi and into the database directory; probably being merged with db_connections !!! *)
 
-open Xapi_stdext_std.Xstringext
 open Xapi_stdext_unix
 
 module D = Debug.Make (struct let name = "parse_db_conf" end)

ocaml/database/redo_log.ml

@@ -12,7 +12,6 @@
  * GNU Lesser General Public License for more details.
  *)
 open Xapi_stdext_pervasives.Pervasiveext
-open Xapi_stdext_std.Xstringext
 open Xapi_stdext_unix
 
 let with_lock = Xapi_stdext_threads.Threadext.Mutex.execute

ocaml/doc/dune

@@ -1,7 +1,7 @@
 (executable
   (modes exe)
   (name jsapi)
-  (libraries    
+  (libraries
     mustache
     rpclib.core
     rpclib.json
@@ -10,7 +10,6 @@
     xapi-consts
     xapi-datamodel
     xapi-stdext-pervasives
-    xapi-stdext-std
     xapi-stdext-unix
   )
   (preprocess (pps ppx_deriving_rpc))

ocaml/doc/jsapi.ml

@@ -12,7 +12,6 @@
  * GNU Lesser General Public License for more details.
  *)
 
-open Xapi_stdext_std.Xstringext
 open Xapi_stdext_pervasives.Pervasiveext
 module Unixext = Xapi_stdext_unix.Unixext
 open Datamodel_types

ocaml/idl/ocaml_backend/gen_rbac.ml

@@ -70,11 +70,10 @@ let role_uuid name = Option.get (hash2uuid name)
 let permission_description = "A basic permission"
 
 let permission_name wire_name =
-  let open Xapi_stdext_std in
   let s1 = replace_char (Printf.sprintf "permission_%s" wire_name) '.' '_' in
   let s2 = replace_char s1 '/' '_' in
-  let s3 = Xstringext.String.replace "*" "WILDCHAR" s2 in
-  Xstringext.String.replace ":" "_" s3
+  let s3 = Xapi_stdext_std.Xstringext.String.replace "*" "WILDCHAR" s2 in
+  replace_char s3 ':' '_'
 
 let permission_index = ref 0
 

ocaml/libs/xapi-stdext/lib/xapi-stdext-std/xstringext.ml

@@ -12,29 +12,27 @@
  * GNU Lesser General Public License for more details.
  *)
 module String = struct
-  include String
-
   let of_char c = String.make 1 c
 
   let rev_map f string =
-    let n = length string in
+    let n = String.length string in
     String.init n (fun i -> f string.[n - i - 1])
 
   let rev_iter f string =
-    for i = length string - 1 downto 0 do
+    for i = String.length string - 1 downto 0 do
       f string.[i]
     done
 
   let fold_left f accu string =
     let accu = ref accu in
-    for i = 0 to length string - 1 do
+    for i = 0 to String.length string - 1 do
       accu := f !accu string.[i]
     done ;
     !accu
 
   let fold_right f string accu =
     let accu = ref accu in
-    for i = length string - 1 downto 0 do
+    for i = String.length string - 1 downto 0 do
       accu := f string.[i] !accu
     done ;
     !accu
@@ -65,17 +63,6 @@ module String = struct
     |> List.of_seq
     |> List.rev
 
-  let index_opt s c =
-    let rec loop i =
-      if String.length s = i then
-        None
-      else if s.[i] = c then
-        Some i
-      else
-        loop (i + 1)
-    in
-    loop 0
-
   let sub_to_end s start =
     let length = String.length s in
     String.sub s start (length - start)

ocaml/libs/xapi-stdext/lib/xapi-stdext-std/xstringext.mli

@@ -12,8 +12,6 @@
  * GNU Lesser General Public License for more details.
  *)
 module String : sig
-  include module type of String
-
   val of_char : char -> string
 
   val rev_map : (char -> char) -> string -> string

ocaml/quicktest/quicktest_http.ml

@@ -34,7 +34,7 @@ module Uds = struct
     with_channel_aux fd func
 
   let http_response_code d =
-    match Xapi_stdext_std.Xstringext.String.split_on_char ' ' d with
+    match String.split_on_char ' ' d with
     | _ :: code :: _ ->
         int_of_string code
     | _ ->

ocaml/xapi/authx.ml

@@ -65,9 +65,7 @@ module AuthX : Auth_signature.AUTH_MODULE = struct
             | [] ->
                 raise Not_found
             | line :: lines -> (
-                let recs =
-                  Xapi_stdext_std.Xstringext.String.split_on_char ':' line
-                in
+                let recs = String.split_on_char ':' line in
                 let username = List.nth recs 0 in
                 let uid = List.nth recs 2 in
                 match fn username uid recs with
@@ -293,9 +291,8 @@ module AuthX : Auth_signature.AUTH_MODULE = struct
     | _ ->
         raise Not_found
 
-  (*
-	In addition, there are some event hooks that auth modules implement as follows:
-*)
+  (* In addition, there are some event hooks that auth modules implement as
+     follows: *)
 
   (* unit on_enable(((string*string) list) config_params)
 

ocaml/xapi/config_file_sync.ml

@@ -15,7 +15,6 @@
 module D = Debug.Make (struct let name = "config_file_sync" end)
 
 open D
-open Xapi_stdext_std.Xstringext
 
 let superuser = "root"