@@ -87,7 +87,7 @@ module Aliases_of_canonical_element : sig
8787
8888 val move_variables_to_mode_in_types : t -> t
8989
90- val compose : t -> newer :Coercion .t -> t
90+ val compose : t -> then_ :Coercion .t -> t
9191end = struct
9292 type t = {
9393 aliases : map_to_canonical Name_mode.Map .t ;
@@ -225,16 +225,12 @@ end = struct
225225 invariant t; (* CR xclerc for xclerc: not guaranteed to hold *)
226226 t
227227
228- let compose { aliases; all; } ~newer =
228+ let compose { aliases; all; } ~then_ =
229229 let f m =
230230 Simple.Map. map
231231 (fun { coercion_to_canonical; } ->
232- (* CR lmaurer: This seems like the wrong way around to me, but
233- possibly only because I'm confused. At least, this function and/or
234- its argument should have a more descriptive name to make it
235- clearer what's going on - [newer] is not descriptive! *)
236232 { coercion_to_canonical =
237- Coercion. compose_exn coercion_to_canonical ~then_: newer ; })
233+ Coercion. compose_exn coercion_to_canonical ~then_ ; })
238234 m
239235 in
240236 let aliases = Name_mode.Map. map f aliases in
@@ -482,7 +478,7 @@ let add_alias_between_canonical_elements t ~canonical_element ~coercion_to_canon
482478 let aliases =
483479 Aliases_of_canonical_element. add
484480 (Aliases_of_canonical_element. union
485- (Aliases_of_canonical_element. compose aliases_of_to_be_demoted ~newer : coercion_to_canonical)
481+ (Aliases_of_canonical_element. compose aliases_of_to_be_demoted ~then_ : coercion_to_canonical)
486482 aliases_of_canonical_element)
487483 to_be_demoted
488484 ~coercion_to_canonical
0 commit comments