concurrency: Rename wait-timeout to timed-out-error for clarity. Add the timer that...

diff --git a/basis/concurrency/conditions/conditions.factor b/basis/concurrency/conditions/conditions.factor
index 7bd72ec826607535c56ea0ed3da95d72bb1ba343..652b858a9212800896cd737d9c3666be6e20e5ed 100644 (file)
--- a/basis/concurrency/conditions/conditions.factor
+++ b/basis/concurrency/conditions/conditions.factor
@@ -20,7 +20,7 @@ IN: concurrency.conditions
         ]\r
     ] dip later ;\r
 \r
-ERROR: wait-timeout ;\r
+ERROR: timed-out-error timer ;\r
 \r
 : queue ( queue -- )\r
     [ self ] dip push-front ; inline\r
@@ -28,7 +28,7 @@ ERROR: wait-timeout ;
 : wait ( queue timeout status -- )\r
     over [\r
         [ queue-timeout ] dip suspend\r
-        [ wait-timeout ] [ stop-timer ] if\r
+        [ timed-out-error ] [ stop-timer ] if\r
     ] [\r
         [ drop queue ] dip suspend drop\r
     ] if ; inline\r

diff --git a/basis/concurrency/mailboxes/mailboxes-tests.factor b/basis/concurrency/mailboxes/mailboxes-tests.factor
index 87a4c3cdba7d87a96ae9969fcad166c8204a8961..9acce4971a93110796e53d10dc0bb1d73665cd77 100644 (file)
--- a/basis/concurrency/mailboxes/mailboxes-tests.factor
+++ b/basis/concurrency/mailboxes/mailboxes-tests.factor
@@ -51,4 +51,4 @@ IN: concurrency.mailboxes.tests
 
 [
     <mailbox> 1 seconds mailbox-get-timeout
-] [ wait-timeout? ] must-fail-with
+] [ timed-out-error? ] must-fail-with