misc cleanup.

diff --git a/basis/math/intervals/intervals-tests.factor b/basis/math/intervals/intervals-tests.factor
index 99c88c72ed3ab9ee08e8255150099a3d84a01e88..b4f6b8d83d75670df908cc0cb42ef60c17fdf8c9 100644 (file)
--- a/basis/math/intervals/intervals-tests.factor
+++ b/basis/math/intervals/intervals-tests.factor
@@ -398,9 +398,9 @@ commutative-ops [
 
 { f } [ empty-interval interval-zero? ] unit-test
 
-{ f } [ -1/0. 1/0. [ empty-interval interval-contains? ] bi@ or ] unit-test
+{ f f } [ -1/0. 1/0. [ empty-interval interval-contains? ] bi@ ] unit-test
 
-{ t } [ -1/0. 1/0. [ full-interval interval-contains? ] bi@ and ] unit-test
+{ t t } [ -1/0. 1/0. [ full-interval interval-contains? ] bi@ ] unit-test
 
 ! Interval bitand
 ${ 0 0xaf [a,b] } [ 0 0xff [a,b] 0 0xaf [a,b] interval-bitand ] unit-test

diff --git a/basis/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor
index 9e860cf03f5c505f15e4885ad58bfebc576afe1e..86f6a719cb72e369e038190e1ec288dbffcd6b8c 100644 (file)
--- a/basis/unicode/collation/collation.factor
+++ b/basis/unicode/collation/collation.factor
@@ -316,7 +316,7 @@ fixup-ducet-for-tibetan
             [ [ primary>> ] append-weights { 0 } ]
             [ [ secondary>> ] append-weights { 0 } ]
             [ [ tertiary>> ] append-weights { 0 } ]
-            [ [ [ secondary>> ] [ tertiary>> ] bi [ zero? ] bi@ and not ] filter [ variable-weight ] map ]
+            [ [ [ secondary>> ] [ tertiary>> ] bi [ zero? ] both? ] reject [ variable-weight ] map ]
         } cleave
     ] { } append-outputs-as ;
 

diff --git a/extra/git/git.factor b/extra/git/git.factor
index 81a2f3637ee02e64e86247c74b525c4ab5335c19..9cbe8d439a18763c336965f5fba8da5a0bf5d025 100644 (file)
--- a/extra/git/git.factor
+++ b/extra/git/git.factor
@@ -105,7 +105,7 @@ ERROR: unhandled-git-version n ;
 
 : changed-index-by-sha1 ( -- seq )
     git-index-contents entries>>
-    [ [ sha1>> ] [ name>> path>git-object bytes>hex-string ] bi = not ] filter ;
+    [ [ sha1>> ] [ name>> path>git-object bytes>hex-string ] bi = ] reject ;
 
 : changed-index-by-mtime ( -- seq )
     git-index-contents entries>>

diff --git a/extra/help/lint/coverage/coverage.factor b/extra/help/lint/coverage/coverage.factor
index 728a0d902983900f79df00cfdd34d0a4a48f06e9..6dfb15e618536b288dc640df62bf5ba16f886846 100644 (file)
--- a/extra/help/lint/coverage/coverage.factor
+++ b/extra/help/lint/coverage/coverage.factor
@@ -139,8 +139,7 @@ PRIVATE>
 GENERIC: <word-help-coverage> ( word -- coverage )
 M: word <word-help-coverage>
     dup [ missing-sections ] [ empty-examples? ] bi
-    2dup [ empty? ] bi@ and
-    word-help-coverage boa ; inline
+    2dup [ empty? ] both? word-help-coverage boa ; inline
 
 M: string <word-help-coverage>
     find-word <word-help-coverage> ; inline

diff --git a/extra/project-euler/064/064.factor b/extra/project-euler/064/064.factor
index 1cd135716219e5ce81d1c3edf346a3a5675dfd5a..87f830d7cf72f83f5823a865d02fb49f45846962 100644 (file)
--- a/extra/project-euler/064/064.factor
+++ b/extra/project-euler/064/064.factor
@@ -116,7 +116,7 @@ C: <cont-frac> cont-frac
 
 : try-all ( -- n )
     2 10000 [a,b]
-    [ perfect-square? not ] filter
+    [ perfect-square? ] reject
     [ find-period ] map
     [ odd? ] filter
     length ;