Remove infix in FindFiles.

Author: cristianoc

analysis/src/FindFiles.ml

@@ -4,20 +4,25 @@ let ( /+ ) = Filename.concat
 
 (* Returns a list of paths, relative to the provided `base` *)
 let getSourceDirectories ~includeDev ~baseDir config =
-  let open Infix in
   let rec handleItem current item =
     match item with
     | Json.Array contents ->
       List.map (handleItem current) contents |> List.concat
     | Json.String text -> [current /+ text]
     | Json.Object _ -> (
       let dir =
-        Json.get "dir" item |?> Json.string |? "Must specify directory"
+        Json.string
+        |> Option.bind (item |> Json.get "dir")
+        |> Option.value ~default:"Must specify directory"
       in
       let typ =
         if includeDev then "lib"
-        else item |> Json.get "type" |?> Json.string |? "lib"
+        else
+          Json.string
+          |> Option.bind (item |> Json.get "type")
+          |> Option.value ~default:"lib"
       in
+
       if typ = "dev" then []
       else
         match item |> Json.get "subdirs" with
@@ -191,12 +196,13 @@ let findDependencyFiles base config =
   let open Infix in
   let deps =
     config |> Json.get "bs-dependencies" |?> Json.array |? []
-    |>  List.filter_map Json.string
+    |> List.filter_map Json.string
   in
   let devDeps =
     config
     |> Json.get "bs-dev-dependencies"
-    |?> Json.array |? [] |>  List.filter_map Json.string
+    |?> Json.array |? []
+    |> List.filter_map Json.string
   in
   let deps = deps @ devDeps in
   Log.log ("Dependencies: " ^ String.concat " " deps);

analysis/src/Scope.ml

@@ -18,13 +18,20 @@ let itemToString item =
   | Module (s, loc) -> "Module " ^ s ^ " " ^ Loc.toString loc
   | Value (s, loc) -> "Value " ^ s ^ " " ^ Loc.toString loc
   | Type (s, loc) -> "Type " ^ s ^ " " ^ Loc.toString loc
+  [@@live]
 
 let create () : t = []
+
 let addConstructor ~name ~loc x = Constructor (name, loc) :: x
+
 let addField ~name ~loc x = Field (name, loc) :: x
+
 let addModule ~name ~loc x = Module (name, loc) :: x
+
 let addOpen ~lid x = Open (Utils.flattenLongIdent lid @ ["place holder"]) :: x
+
 let addValue ~name ~loc x = Value (name, loc) :: x
+
 let addType ~name ~loc x = Type (name, loc) :: x
 
 let iterValuesBeforeFirstOpen f x =