Merge branch 'master' into irc

diff --combined extra/irc/client/internals/internals-tests.factor
index 8d48f0c0a11f58718f32041e4825002a39d0ae02,27b5648f973e162d482ba5a13bb90d0779c2435e..2c26188e0450ad0446e04a24ab162b4aabe5121b
--- 1/extra/irc/client/internals/internals-tests.factor
--- 2/extra/irc/client/internals/internals-tests.factor
+++ b/extra/irc/client/internals/internals-tests.factor
@@@ -41,7 -41,7 +41,7 @@@ M: mb-writer dispose drop 
  : %pop-output-line ( -- string ) irc> stream>> out>> lines>> pop ;
  
  : read-matching-message ( chat quot: ( msg -- ? ) -- irc-message )
-     [ in-messages>> 0.1 seconds ] dip mailbox-get-timeout? ;
+     [ in-messages>> 0.1 seconds ] dip mailbox-get-timeout? ; inline
  
  : spawning-irc ( quot: ( -- ) -- )
      [ spawn-client ] dip [ (terminate-irc) ] compose with-irc ; inline
@@@ -76,7 -76,7 +76,7 @@@
  ! Test connect
  { V{ "NICK factorbot" "USER factorbot hostname servername :irc.factor" } } [
      "someserver" irc-port "factorbot" f <irc-profile> <irc-client>
 -    [ 2drop <test-stream> t ] >>connect
 +    [ 2drop <test-stream> ] >>connect
      [
          (connect-irc)
          (do-login)