io.directories: removing with-qualified-directory-{files,entries}.

diff --git a/basis/io/directories/directories-docs.factor b/basis/io/directories/directories-docs.factor
index 351371e35d2e7655ac19a693ee86f7706475ffcb..82b46a9393ad842772baa356f93bec663cdeccd7 100644 (file)
--- a/basis/io/directories/directories-docs.factor
+++ b/basis/io/directories/directories-docs.factor
@@ -164,8 +164,6 @@ ARTICLE: "io.directories.listing" "Directory listing"
     with-directory-files
     qualified-directory-entries
     qualified-directory-files
-    with-qualified-directory-files
-    with-qualified-directory-entries
 } ;
 
 ARTICLE: "io.directories.create" "Creating directories"

diff --git a/basis/io/directories/directories.factor b/basis/io/directories/directories.factor
index 09ec795726cb088b7d3f9e6a1a6f581ce8ff39e7..91164abe5348f49f17e2ea1c95cf00e69360ac5b 100644 (file)
--- a/basis/io/directories/directories.factor
+++ b/basis/io/directories/directories.factor
@@ -68,12 +68,6 @@ HOOK: (directory-entries) os ( path -- seq )
 : qualified-directory-files ( path -- seq )
     dup directory-files [ append-path ] with map! ;
 
-: with-qualified-directory-files ( path quot -- )
-    '[ "" qualified-directory-files @ ] with-directory ; inline
-
-: with-qualified-directory-entries ( path quot -- )
-    '[ "" qualified-directory-entries @ ] with-directory ; inline
-
 SYMBOL: traversal-method
 
 SYMBOLS: +depth-first+ +breadth-first+ ;
@@ -189,12 +183,10 @@ ERROR: sequence-expected obj ;
     0 swap [ link-size/0 + ] each-file ;
 
 : directory-usage ( path -- assoc )
-    [
-        [
-            [ name>> dup ] [ directory? ] bi
-            [ directory-size ] [ link-size/0 ] if
-        ] { } map>assoc
-    ] with-qualified-directory-entries sort-values ;
+    qualified-directory-entries [
+        [ name>> dup ] [ directory? ] bi
+        [ directory-size ] [ link-size/0 ] if
+    ] { } map>assoc sort-values ;
 
 : find-files-by-extensions ( path extensions -- seq )
     [ >lower ] map

diff --git a/basis/io/monitors/recursive/recursive.factor b/basis/io/monitors/recursive/recursive.factor
index 5dcb02bf93479332a16862fb52ee2b0850d7bbfe..56052dfa0ba7a0cb7fd1f50b921bc12bf813955e 100644 (file)
--- a/basis/io/monitors/recursive/recursive.factor
+++ b/basis/io/monitors/recursive/recursive.factor
@@ -20,9 +20,7 @@ DEFER: add-child-monitor
 
 : add-child-monitors ( path -- )
     ! We yield since this directory scan might take a while.
-    [
-        [ add-child-monitor ] each yield
-    ] with-qualified-directory-files ;
+    qualified-directory-files [ add-child-monitor ] each yield ;
 
 : add-child-monitor ( path -- )
     notify? [ dup { +add-file+ } monitor tget queue-change ] when