From: John Benediktsson <mrjbq7@gmail.com>
Date: Wed, 4 Jan 2017 03:12:29 +0000 (-0800)
Subject: use with-variable in some places with-scope was used.
X-Git-Tag: unmaintained~308
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=3974ba8ba3b7749709f5bddfc7d2134b38af1948

use with-variable in some places with-scope was used.
---

diff --git a/basis/http/http-tests.factor b/basis/http/http-tests.factor
index 5067e7ea05..444edc3157 100644
--- a/basis/http/http-tests.factor
+++ b/basis/http/http-tests.factor
@@ -237,13 +237,12 @@ http.server.dispatchers db.tuples ;
 ] unit-test
 
 : test-with-dispatcher ( dispatcher quot -- )
-    '[
-        main-responder set
+    [ main-responder ] dip '[
         <http-server> 0 >>insecure f >>secure
         [
             server-addrs random "addr" set @
         ] with-threaded-server
-    ] with-scope ; inline
+    ] with-variable ; inline
 
 USING: locals ;
 
diff --git a/basis/nmake/nmake.factor b/basis/nmake/nmake.factor
index 8050d2d3fe..e9090f9101 100644
--- a/basis/nmake/nmake.factor
+++ b/basis/nmake/nmake.factor
@@ -32,13 +32,9 @@ MACRO: finish-nmake ( exemplars -- quot )
     length [ firstn ] curry ;
 
 :: nmake ( quot exemplars -- )
-    [
-        exemplars
-        [ 0 swap new-resizable ] map
-        building-seq set
-
+    exemplars [ 0 swap new-resizable ] map
+    building-seq [
         quot call
-
         building-seq get
         exemplars [ [ like ] 2map ] [ finish-nmake ] bi
-    ] with-scope ; inline
+    ] with-variable ; inline
diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor
index e53ca0a76d..26af9482b3 100644
--- a/basis/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@@ -73,7 +73,7 @@ os macosx? [
     "tools.deploy.test.3"
     "tools.deploy.test.4"
 } [
-    [ ] swap [
+    { } swap [
         shake-and-bake
         run-temp-image
     ] curry unit-test
@@ -91,16 +91,14 @@ M: quit-responder call-responder*
     quit-responder "quit" add-responder ;
 
 : test-httpd ( responder -- )
-    [
-        main-responder set
+    main-responder [
         <http-server>
             0 >>insecure
             f >>secure
         start-server
         servers>> first addr>> port>>
         dup number>string "port-number" temp-file ascii set-file-contents
-    ] with-scope
-    "port" set ;
+    ] with-variable "port" set ;
 
 { } [
     <dispatcher>