From 092d4e3c3d9541e6f716a1edfc1433508b21e6fe Mon Sep 17 00:00:00 2001 From: Carl Eastlund Date: Sat, 29 May 2010 14:49:50 -0400 Subject: [PATCH] Replaced unstable/hash with unstable/cce/hash. original commit: 3a525b9a121de971967b59ab3a684b5d104b53ed --- collects/typed-scheme/infer/constraints.rkt | 2 +- collects/typed-scheme/infer/dmap.rkt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/collects/typed-scheme/infer/constraints.rkt b/collects/typed-scheme/infer/constraints.rkt index e87137c0..2626eb2f 100644 --- a/collects/typed-scheme/infer/constraints.rkt +++ b/collects/typed-scheme/infer/constraints.rkt @@ -75,7 +75,7 @@ [(map2 dmap2) (in-pairs maps2)]) (with-handlers ([exn:infer? (lambda (_) #f)]) (cons - (simple-hash-union map1 map2 (lambda (k v1 v2) (c-meet v1 v2))) + (hash-union map1 map2 #:combine c-meet) (dmap-meet dmap1 dmap2)))))]) (when (null? maps) (fail! maps1 maps2)) diff --git a/collects/typed-scheme/infer/dmap.rkt b/collects/typed-scheme/infer/dmap.rkt index 1735c49c..7e2e3b39 100644 --- a/collects/typed-scheme/infer/dmap.rkt +++ b/collects/typed-scheme/infer/dmap.rkt @@ -62,5 +62,4 @@ (define (dmap-meet dm1 dm2) (make-dmap - (simple-hash-union (dmap-map dm1) (dmap-map dm2) - (lambda (k dc1 dc2) (dcon-meet dc1 dc2))))) + (hash-union (dmap-map dm1) (dmap-map dm2) #:combine dcon-meet)))