Remove alarms from using list, minor refactoring

diff --git a/basis/furnace/cache/cache.factor b/basis/furnace/cache/cache.factor
index 51de8c0be6852053c8af3ad55a7508ac90899508..676e41d3bcf5886579f27b148e067e7ce56761ee 100644 (file)
--- a/basis/furnace/cache/cache.factor
+++ b/basis/furnace/cache/cache.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel accessors math.intervals
-system calendar alarms fry
+system calendar fry
 random db db.tuples db.types
 http.server.filters ;
 IN: furnace.cache

diff --git a/basis/models/delay/delay.factor b/basis/models/delay/delay.factor
index b71a29e4efed64ce18c23c59397878dc089982a5..8292bb9c04fb9ba0e852cc18300eb46c4731eca3 100644 (file)
--- a/basis/models/delay/delay.factor
+++ b/basis/models/delay/delay.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
-USING: accessors kernel models alarms ;\r
+USING: accessors alarms fry kernel models ;\r
 IN: models.delay\r
 \r
 TUPLE: delay < model model timeout alarm ;\r
@@ -19,7 +19,8 @@ TUPLE: delay < model model timeout alarm ;
 \r
 : start-delay ( delay -- )\r
     dup\r
-    [ [ f >>alarm update-delay-model ] curry ] [ timeout>> ] bi later\r
+    [ '[ _ f >>alarm update-delay-model ] ] [ timeout>> ] bi\r
+    later\r
     >>alarm drop ;\r
 \r
 M: delay model-changed nip dup stop-delay start-delay ;\r

diff --git a/basis/models/models.factor b/basis/models/models.factor
index 1b6f0f30c270f97f03743076c6a7deb329e043fe..efe9bac88d0297c31c5db1cb21292c65fbb2ed37 100644 (file)
--- a/basis/models/models.factor
+++ b/basis/models/models.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors generic kernel math sequences arrays assocs
-alarms calendar math.order continuations fry ;
+calendar math.order continuations fry ;
 IN: models
 
 TUPLE: model < identity-tuple