Merge pull request #1280 from cryspen/fix-crash-bundle-disambiguation

fix(engine) Add default case for disambiguation of bundle element names
cryspen · Feb 3, 2025 · aaeb36b · aaeb36b
2 parents 3d2cbc0 + 3937a6a
commit aaeb36b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/engine/lib/concrete_ident/concrete_ident.ml b/engine/lib/concrete_ident/concrete_ident.ml
@@ -256,7 +256,9 @@ module MakeToString (R : VIEW_RENDERER) = struct
           in
           let is_assoc_or_field (rel_path : View.RelPath.t) : bool =
             match List.last rel_path with
-            | Some (`AssociatedItem _ | `Field _) -> true
+            | Some (`AssociatedItem (_, (`Trait _ | `Impl (_, `Trait, _))))
+            | Some (`Field _) ->
+                true
             | _ -> false
           in
           let name =
@@ -284,7 +286,7 @@ module MakeToString (R : VIEW_RENDERER) = struct
                          path (* This might shadow, we should escape *))
                  (* Find the shortest name that doesn't exist already *)
               |> List.find ~f:(Hash_set.mem name_set >> not)
-              |> Option.value_exn
+              |> Option.value ~default:(name ^ ([%hash: t] i |> Int.to_string))
             else name
           in
           (* Update the maps and hashtables *)