[multicore] switch regular expressions back to str

Summary: Re.Str is not thread safe. Str is (with caveats) so for now we need to switch. https://discuss.ocaml.org/t/re-str-is-not-thread-safe/9425 Reviewed By: jvillard Differential Revision: D67016756 Privacy Context Container: L1208441 fbshipit-source-id: f57868975314b74533fb2a3a7aa21262fa5b328a
facebook · Dec 10, 2024 · 7f8fc07 · 7f8fc07
1 parent 2a1ff41
commit 7f8fc07
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/infer/src/integration/unit/SuppressionsTest.ml b/infer/src/integration/unit/SuppressionsTest.ml
@@ -141,11 +141,9 @@ let%expect_test "match everything wildcard is invalid" =
 
 let%expect_test "syntax error wildcard" =
   t @@ Suppressions.parse_lines ["1+1 // @infer-ignore-every *"] ;
-  [%expect
-    {|
+  [%expect {|
     RESULT: Empty
-    ERRORS: * not a valid issue_type / wildcard
-    ;  Invalid regex: * |}]
+    ERRORS: * not a valid issue_type / wildcard |}]
 
 
 (** {2 matching} *)

diff --git a/infer/src/istd/IStd.ml b/infer/src/istd/IStd.ml
@@ -12,9 +12,6 @@ include Core
 (* easier to write Unix than Core_unix *)
 module Unix = Core_unix
 
-(* use Re.Str instead of Str *)
-module Str = Re.Str
-
 (* we don't care about the _unix distinction *)
 module Filename = struct
   include Filename

diff --git a/infer/src/istd/dune b/infer/src/istd/dune
@@ -18,6 +18,7 @@
   iter
   mtime
   re
+  str
   yojson)
  (preprocess
   (pps ppx_compare ppx_hash ppx_sexp_conv)))
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ @@
       iter
       mtime
       re
+      str
       yojson)
      (preprocess
       (pps ppx_compare ppx_hash ppx_sexp_conv)))
@@ Expand Down @@