fix resi

Author: zth

compiler/ml/cmt_format.ml

@@ -167,7 +167,15 @@ let get_saved_types () = !saved_types
 let set_saved_types l = saved_types := l
 
 let record_deprecated_used ?deprecated_context ?migration_template ?migration_in_pipe_chain_template source_loc deprecated_text =
-  deprecated_used := {Cmt_utils.source_loc; deprecated_text; migration_template; migration_in_pipe_chain_template; context = deprecated_context} :: !deprecated_used
+  deprecated_used :=
+    {
+      Cmt_utils.source_loc;
+      deprecated_text;
+      migration_template;
+      migration_in_pipe_chain_template;
+      context = deprecated_context;
+    }
+    :: !deprecated_used
 
 let _ = Cmt_utils.record_deprecated_used := record_deprecated_used
 
@@ -210,4 +218,4 @@ let save_cmt filename modname binary_annots sourcefile initial_env cmi =
          output_cmt oc cmt)
   end;
   clear ()
-#endif
+#endif

tests/tools_tests/src/expected/StdlibMigration_Interface.resi.expected

@@ -1,11 +1,11 @@
 /* Migration tests for interface (.resi) files using stdlib deprecations */
 
 // Type alias migrations exercised via externals
-external arr: JSON.t<int> = "arr"
-external reT: Js.Re.t = "re"
-external json: Js.Json.t = "json"
-external nestedArr: Js.Array.t<Js.Re.t> = "nestedArr"
+external arr: array<int> = "arr"
+external reT: RegExp.t = "re"
+external json: JSON.t = "json"
+external nestedArr: array<RegExp.t> = "nestedArr"
 
 // Function type using a deprecated alias
-external useSet: Js.Set.t<int> => unit = "useSet"
+external useSet: Set.t<int> => unit = "useSet"
 

tools/src/migrate.ml

@@ -703,19 +703,8 @@ let migrate ~entryPointFile ~outputMode =
       let {Res_driver.parsetree = signature; comments; source} =
         parser ~filename:path
       in
-      (* Load cmti/cmt info to obtain deprecation migration templates, just like .res *)
-      match
-        (* Prefer implementation cmt info when available, since cmti may not
-            record deprecated usages. Fallback to cmti if needed. *)
-        let impl_path =
-          if Filename.check_suffix path ".resi" then
-            Filename.chop_suffix path ".resi" ^ ".res"
-          else path
-        in
-        match Cmt.loadCmtInfosFromPath ~path:impl_path with
-        | Some infos -> Some infos
-        | None -> Cmt.loadCmtInfosFromPath ~path
-      with
+
+      match Cmt.loadCmtInfosFromPath ~path with
       | None ->
         Error
           (Printf.sprintf