Add real disambiguator instead of modifying string to resolve name cl…

…ashes in bundles.

engine/lib/concrete_ident/concrete_ident.ml

@@ -635,6 +635,14 @@ module Create = struct
   let constructor name =
     let path = name.def_id.path @ [ { data = Ctor; disambiguator = 0 } ] in
     { name with def_id = { name.def_id with path } }
+
+  let add_disambiguator name disambiguator =
+    let path = name.def_id.path in
+    let last = List.last_exn path in
+    let path =
+      List.drop_last_exn path @ [ { data = last.data; disambiguator } ]
+    in
+    { name with def_id = { name.def_id with path } }
 end
 
 let lookup_raw_impl_info (impl : t) : Types.impl_infos option =

engine/lib/concrete_ident/concrete_ident.mli

@@ -38,6 +38,10 @@ module Create : sig
   val map_last : f:(string -> string) -> t -> t
   (** [map_last f ident] applies [f] on the last chunk of [ident]'s
       path if it holds a string *)
+
+  val add_disambiguator : t -> int -> t
+  (** [add_disambiguator ident d] changes the disambiguator on
+      the last chunk of [ident]'s path to [d] *)
 end
 
 type view = { crate : string; path : string list; definition : string }

engine/lib/dependencies.ml

@@ -435,10 +435,7 @@ module Make (F : Features.T) = struct
             (List.mem duplicates (new_name_under_ns id)
                ~equal:Concrete_ident.equal)
         then id
-        else
-          Concrete_ident.Create.map_last
-            ~f:(fun name -> name ^ (Concrete_ident.hash id |> Int.to_string))
-            id
+        else Concrete_ident.Create.add_disambiguator id (Concrete_ident.hash id)
       in
       let renamings =
         List.map