assocs.extras: fix usages of collect-key-by collect-value-by

diff --git a/extra/wordlet/wordlet.factor b/extra/wordlet/wordlet.factor
index 151a6d72fe48496d271a45bfe1245fc87d68938c..05a0bbd5eda7b8b59511b4dbadad7f79d8c07ddb 100644 (file)
--- a/extra/wordlet/wordlet.factor
+++ b/extra/wordlet/wordlet.factor
@@ -49,7 +49,7 @@ TUPLE: wordlet-game secret-word chances guesses ;
        guess>chars
     ] with map concat members
     [ background of ] assoc-map
-    [ first ] collect-value-by
+    [ drop ] collect-value-by
     [ [ color>n ] zip-with sort-values reverse first first ] assoc-map
     CHAR: a CHAR: z [a..b] [ 1string COLOR: white ] { } map>assoc [ or ] assoc-merge ;
 

diff --git a/extra/zoneinfo/zoneinfo.factor b/extra/zoneinfo/zoneinfo.factor
index 96aed5d375cf05830483e2892b7f2e766403e004..58782b4ed31a0cdec6e289695ad224c73d713792 100644 (file)
--- a/extra/zoneinfo/zoneinfo.factor
+++ b/extra/zoneinfo/zoneinfo.factor
@@ -55,10 +55,10 @@ MEMO: zoneinfo-country-zones ( -- seq )
 : lookup-country-names ( seq -- seq' ) [ lookup-country-name ] map ;
 
 : timezone>country-map ( -- alist )
-    parse-zonetabs [ second ] collect-key-by ;
+    parse-zonetabs [ nip ] collect-key-by ;
 
 : country>timezones-map ( -- alist )
-    parse-zonetabs [ first ] collect-value-by ;
+    parse-zonetabs [ drop ] collect-value-by ;
 
 : country-timezones-map ( -- alist )
     country>timezones-map [ dup lookup-country-names zip ] map-values ;