factor: trim using lists

[factor.git] / basis / io / pools / pools.factor

diff --git a/basis/io/pools/pools.factor b/basis/io/pools/pools.factor
index e03bdeabf9d563beb92820b1e60ea857abc152e5..195c3a22dacd30682f80d7ebd9edbd809a6e561a 100644 (file)
--- a/basis/io/pools/pools.factor
+++ b/basis/io/pools/pools.factor
@@ -1,13 +1,13 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel arrays namespaces sequences continuations
-destructors io.sockets alien alien.syntax ;
+USING: accessors alien continuations destructors io.sockets
+kernel namespaces sequences ;
 IN: io.pools
 
 TUPLE: pool connections disposed expired ;
 
 : check-pool ( pool -- )
-    dup check-disposed
+    check-disposed
     dup expired>> expired? [
         31337 <alien> >>expired
         connections>> delete-all
@@ -23,7 +23,7 @@ M: pool dispose* connections>> dispose-each ;
 : with-pool ( pool quot -- )
     [ pool swap with-variable ] curry with-disposal ; inline
 
-TUPLE: return-connection conn pool ;
+TUPLE: return-connection-state conn pool ;
 
 : return-connection ( conn pool -- )
     dup check-pool connections>> push ;
@@ -45,11 +45,11 @@ GENERIC: make-connection ( pool -- conn )
     [ [ acquire-connection ] keep ] dip
     [ (with-pooled-connection) ] [ ] [ 2drop dispose ] cleanup ; inline
 
-M: return-connection dispose
+M: return-connection-state dispose
     [ conn>> ] [ pool>> ] bi return-connection ;
 
 : return-connection-later ( db pool -- )
-    \ return-connection boa &dispose drop ;
+    \ return-connection-state boa &dispose drop ;
 
 TUPLE: datagram-pool < pool addrspec ;