@@ -85,7 +85,7 @@ module Aliases_of_canonical_element : sig
8585
8686 val merge : t -> t -> t
8787
88- val compose : t -> newer :Coercion .t -> t
88+ val compose : t -> then_ :Coercion .t -> t
8989end = struct
9090 type t = {
9191 aliases : map_to_canonical Name_mode.Map .t ;
@@ -223,16 +223,12 @@ end = struct
223223 invariant t; (* CR xclerc for xclerc: not guaranteed to hold *)
224224 t
225225
226- let compose { aliases; all; } ~newer =
226+ let compose { aliases; all; } ~then_ =
227227 let f m =
228228 Simple.Map. map
229229 (fun { coercion_to_canonical; } ->
230- (* CR lmaurer: This seems like the wrong way around to me, but
231- possibly only because I'm confused. At least, this function and/or
232- its argument should have a more descriptive name to make it
233- clearer what's going on - [newer] is not descriptive! *)
234230 { coercion_to_canonical =
235- Coercion. compose_exn coercion_to_canonical ~then_: newer ; })
231+ Coercion. compose_exn coercion_to_canonical ~then_ ; })
236232 m
237233 in
238234 let aliases = Name_mode.Map. map f aliases in
@@ -456,7 +452,7 @@ let add_alias_between_canonical_elements t ~canonical_element ~coercion_to_canon
456452 let aliases =
457453 Aliases_of_canonical_element. add
458454 (Aliases_of_canonical_element. union
459- (Aliases_of_canonical_element. compose aliases_of_to_be_demoted ~newer : coercion_to_canonical)
455+ (Aliases_of_canonical_element. compose aliases_of_to_be_demoted ~then_ : coercion_to_canonical)
460456 aliases_of_canonical_element)
461457 to_be_demoted
462458 ~coercion_to_canonical
0 commit comments