remove toplevel open

Author: cristianoc

analysis/src/State.ml

@@ -1,15 +1,13 @@
-open Infix
-open TopTypes
-
 let isMl path =
   Filename.check_suffix path ".ml" || Filename.check_suffix path ".mli"
 
 let converter src =
   let mlToOutput s = [s] in
-  fold src mlToOutput (fun src ->
+  Infix.fold src mlToOutput (fun src ->
       match isMl src with true -> mlToOutput | false -> fun x -> [x])
 
 let newDocsForCmt ~moduleName cmtCache changed cmt src =
+  let open Infix in
   let uri = Uri2.fromPath (src |? cmt) in
   match Process_406.fileForCmt ~moduleName ~uri cmt (converter src) with
   | Error e ->
@@ -20,7 +18,7 @@ let newDocsForCmt ~moduleName cmtCache changed cmt src =
     Some file
 
 let docsForCmt ~moduleName cmt src state =
-  if Hashtbl.mem state.cmtCache cmt then
+  if Hashtbl.mem state.TopTypes.cmtCache cmt then
     let mtime, docs = Hashtbl.find state.cmtCache cmt in
     (* TODO: I should really throttle this mtime checking to like every 50 ms or so *)
     match Files.getMtime cmt with
@@ -62,7 +60,7 @@ let getFullFromCmt ~state ~uri =
     | None -> Error ("can't find module " ^ moduleName))
 
 let docsForModule modname state ~package =
-  if Hashtbl.mem package.pathsForModule modname then (
+  if Hashtbl.mem package.TopTypes.pathsForModule modname then (
     let paths = Hashtbl.find package.pathsForModule modname in
     (* TODO: do better *)
     let cmt = SharedTypes.getCmt paths in