From 3a6eefcc8e5524f79730e1a3efb31ef961e67f02 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Thu, 9 Feb 2017 15:50:33 -0800
Subject: [PATCH] using ignore-errors instead of [ drop ] recover.

---
 basis/compiler/tests/optimizer.factor                         | 2 +-
 basis/db/tuples/tuples-tests.factor                           | 4 ++--
 basis/io/files/unique/unique-tests.factor                     | 4 ++--
 basis/io/sockets/secure/openssl/openssl-tests.factor          | 2 +-
 .../tuple/change-tracking/change-tracking-tests.factor        | 2 +-
 extra/fuel/eval/eval.factor                                   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/basis/compiler/tests/optimizer.factor b/basis/compiler/tests/optimizer.factor
index ecc14d5edc..8565b91346 100644
--- a/basis/compiler/tests/optimizer.factor
+++ b/basis/compiler/tests/optimizer.factor
@@ -450,5 +450,5 @@ STRUCT: BitmapData { Scan0 void* } ;
 
 ! #1187
 { } [
-    10 [ [ minor-gc split-slice ] [ drop ] recover ] times
+    10 [ [ minor-gc split-slice ] ignore-errors ] times
 ] unit-test
diff --git a/basis/db/tuples/tuples-tests.factor b/basis/db/tuples/tuples-tests.factor
index 4958ef9f6a..e3c72d9710 100644
--- a/basis/db/tuples/tuples-tests.factor
+++ b/basis/db/tuples/tuples-tests.factor
@@ -293,7 +293,7 @@ TUPLE: serialize-me id data ;
         { "id" "ID" +db-assigned-id+ }
         { "data" "DATA" FACTOR-BLOB }
     } define-persistent
-    [ serialize-me drop-table ] [ drop ] recover
+    [ serialize-me drop-table ] ignore-errors
     [ ] [ serialize-me create-table ] unit-test
 
     [ ] [ T{ serialize-me f f H{ { 1 2 } } } insert-tuple ] unit-test
@@ -327,7 +327,7 @@ TUPLE: exam id name score ;
         { "name" "NAME" TEXT }
         { "score" "SCORE" INTEGER }
     } define-persistent
-    [ exam drop-table ] [ drop ] recover
+    [ exam drop-table ] ignore-errors
     [ ] [ exam create-table ] unit-test
 
     [ ] [ T{ exam f f "Kyle" 100 } insert-tuple ] unit-test
diff --git a/basis/io/files/unique/unique-tests.factor b/basis/io/files/unique/unique-tests.factor
index e12600c7a2..a45137d703 100644
--- a/basis/io/files/unique/unique-tests.factor
+++ b/basis/io/files/unique/unique-tests.factor
@@ -16,7 +16,7 @@ IN: io.files.unique.tests
 { t } [
     [
         current-directory get
-        [ [ "FAILDOG" throw ] cleanup-unique-directory ] [ drop ] recover
+        [ [ "FAILDOG" throw ] cleanup-unique-directory ] ignore-errors
         current-directory get =
     ] with-temp-directory
 ] unit-test
@@ -54,4 +54,4 @@ IN: io.files.unique.tests
             [ file-name ] map first2 mismatch
         ] cleanup-unique-files
     ] with-temp-directory
-] unit-test
\ No newline at end of file
+] unit-test
diff --git a/basis/io/sockets/secure/openssl/openssl-tests.factor b/basis/io/sockets/secure/openssl/openssl-tests.factor
index 450a0ae4ca..b3ea818c11 100644
--- a/basis/io/sockets/secure/openssl/openssl-tests.factor
+++ b/basis/io/sockets/secure/openssl/openssl-tests.factor
@@ -26,5 +26,5 @@ TUPLE: fake-fd fd ;
 M: fake-fd cancel-operation ( obj -- ) drop ;
 
 { f } [
-    33 fake-fd boa <ssl-handle> [ maybe-handshake ] [ drop ] recover connected>>
+    33 fake-fd boa <ssl-handle> [ maybe-handshake ] ignore-errors connected>>
 ] unit-test
diff --git a/extra/classes/tuple/change-tracking/change-tracking-tests.factor b/extra/classes/tuple/change-tracking/change-tracking-tests.factor
index 5aade593f3..ffe55feb6b 100644
--- a/extra/classes/tuple/change-tracking/change-tracking-tests.factor
+++ b/extra/classes/tuple/change-tracking/change-tracking-tests.factor
@@ -7,4 +7,4 @@ TUPLE: resource < change-tracking-tuple
 : <resource> ( pathname -- resource ) f swap resource boa ;
 
 { t } [ "foo" <resource> "bar" >>pathname changed?>> ] unit-test
-{ f } [ "foo" <resource> [ 123 >>pathname ] [ drop ] recover changed?>> ] unit-test
+{ f } [ "foo" <resource> [ 123 >>pathname ] ignore-errors changed?>> ] unit-test
diff --git a/extra/fuel/eval/eval.factor b/extra/fuel/eval/eval.factor
index b6956d4aca..85006e9089 100644
--- a/extra/fuel/eval/eval.factor
+++ b/extra/fuel/eval/eval.factor
@@ -63,7 +63,7 @@ t eval-res-flag set-global
     [ [ eval-error set-global ] [ print-error ] bi ] recover ;
 
 : eval-usings ( usings -- )
-    [ [ use-vocab ] curry [ drop ] recover ] each ;
+    [ [ use-vocab ] curry ignore-errors ] each ;
 
 : eval-in ( in -- )
     [ set-current-vocab ] when* ;