factor: trim some using lists

diff --git a/basis/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor
index 94a1d3f75249dd1a2ef5f5b11b79b9253a060369..f69b0945feab23dad5982c8297f61c2e28ea3a53 100644 (file)
--- a/basis/unicode/breaks/breaks.factor
+++ b/basis/unicode/breaks/breaks.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2008 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs combinators fry interval-maps
-kernel literals locals math namespaces parser sequences
-simple-flat-file unicode.categories unicode.data
-unicode.normalize.private words words.constant math.order ;
+USING: accessors arrays combinators interval-maps kernel
+literals math namespaces sequences simple-flat-file
+unicode.categories unicode.data unicode.normalize.private words ;
 IN: unicode.breaks
 
 <PRIVATE

diff --git a/basis/unicode/case/case.factor b/basis/unicode/case/case.factor
index 1efeeced692a17f4582f8c63d26e97d37992b952..d18e23dadec3891b8443cf9637ee79b908a3f576 100644 (file)
--- a/basis/unicode/case/case.factor
+++ b/basis/unicode/case/case.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008, 2009 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators.short-circuit kernel locals namespaces sbufs
+USING: combinators.short-circuit kernel namespaces sbufs
 sequences splitting unicode.categories unicode.data ;
 QUALIFIED: ascii
 IN: unicode.case

diff --git a/basis/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor
index 1f81d8dd9889a30227b24d38666f91f9a426aa06..108eb69389aca7ae19f98d13125606c9aa1eab9c 100644 (file)
--- a/basis/unicode/collation/collation.factor
+++ b/basis/unicode/collation/collation.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators
-combinators.short-circuit combinators.smart fry kernel locals make
+combinators.short-circuit combinators.smart fry kernel make
 math math.order math.parser namespaces sequences
 simple-flat-file splitting strings unicode.data ;
 IN: unicode.collation

diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor
index 4fb27058994119c9c5edb09e9f6730f0d008cfec..459c3b017b927c49be95045b2167f5844d93c9c0 100644 (file)
--- a/basis/unicode/data/data.factor
+++ b/basis/unicode/data/data.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays ascii assocs byte-arrays combinators
 combinators.short-circuit grouping hashtables interval-sets
-io.encodings.utf8 io.files kernel locals make math math.bitwise
-math.order math.parser ranges memoize namespaces sequences
+io.encodings.utf8 io.files kernel make math math.bitwise
+math.order math.parser ranges namespaces sequences
 sets simple-flat-file sorting splitting strings.parser ;
 IN: unicode.data
 

diff --git a/basis/unicode/normalize/normalize.factor b/basis/unicode/normalize/normalize.factor
index 36681a6aa871f5f385307faba37424195b362bd0..cc22e6d339feaaab058c751e545dc51c3bd06dce 100644 (file)
--- a/basis/unicode/normalize/normalize.factor
+++ b/basis/unicode/normalize/normalize.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays ascii combinators
-combinators.short-circuit hints kernel locals make math
+combinators.short-circuit hints kernel make math
 math.order sbufs sequences sorting.insertion strings
 unicode.data vectors ;
 IN: unicode.normalize

diff --git a/basis/unicode/script/script.factor b/basis/unicode/script/script.factor
index 427497b73dc4ff6d742309675865a3a74fdf8df6..7d7f7a6946868bfaa37f3325783af957207963df 100644 (file)
--- a/basis/unicode/script/script.factor
+++ b/basis/unicode/script/script.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: interval-maps literals simple-flat-file ;
+USING: literals simple-flat-file ;
 IN: unicode.script
 
 CONSTANT: script-table $[

diff --git a/basis/unicode/unicode.factor b/basis/unicode/unicode.factor
index 314e12ef22b1977d7d08fe39e4d3fcaad4cf1ce5..e67b3a5366d3199fc797e7d81b62e818fa2ef3e8 100644 (file)
--- a/basis/unicode/unicode.factor
+++ b/basis/unicode/unicode.factor
@@ -3,7 +3,7 @@ hints interval-maps kernel math math.order sequences sorting
 strings unicode.breaks.private unicode.case.private
 unicode.categories unicode.collation unicode.collation.private
 unicode.data unicode.data.private unicode.normalize.private
-unicode.script locals ranges ;
+unicode.script ranges ;
 IN: unicode
 
 CATEGORY: blank Zs Zl Zp | "\r\n\t" member? ;

diff --git a/basis/xml/syntax/inverse/inverse.factor b/basis/xml/syntax/inverse/inverse.factor
index 63cb8dc68cbe6366b8be4f5e18d43b33e9896b6a..4bed879fcda80599b1a62abb51096848d4971fef 100644 (file)
--- a/basis/xml/syntax/inverse/inverse.factor
+++ b/basis/xml/syntax/inverse/inverse.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators
 combinators.short-circuit inverse kernel namespaces sequences
-sequences.generalizations sorting strings unicode xml.data
-xml.syntax.private ;
+sequences.generalizations sorting strings unicode xml.data ;
+USE: xml.syntax.private ! required but does not reference words
 IN: xml.syntax.inverse
 
 : remove-blanks ( seq -- newseq )

diff --git a/extra/modern/modern.factor b/extra/modern/modern.factor
index 64752f2446a3e8d7d38e9535ca274c04b0b23b3a..435aaedd6968f8b0d4daaa4bbd3ededd8c1c74d1 100644 (file)
--- a/extra/modern/modern.factor
+++ b/extra/modern/modern.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2016 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs combinators
+USING: accessors arrays assocs combinators combinators.extras
 combinators.short-circuit continuations io.encodings.utf8
 io.files kernel make math math.order modern.paths modern.slices
-sequences sequences.extras sets combinators.extras splitting strings
-unicode vocabs.loader ;
+sequences sequences.extras sets splitting strings unicode
+vocabs.loader ;
 IN: modern
 
 ERROR: string-expected-got-eof n string ;

diff --git a/extra/modern/slices/slices.factor b/extra/modern/slices/slices.factor
index ff1a54b511ef84b30540d2c3e56502dafe5ee5f6..8d3d9da8d0b3f27b4b97efc634469738baddc1cc 100644 (file)
--- a/extra/modern/slices/slices.factor
+++ b/extra/modern/slices/slices.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2016 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators.extras kernel math sequences
-sequences.deep sequences.extras sequences.private strings
-unicode ;
+sequences.deep sequences.extras strings unicode ;
 IN: modern.slices
 
 : >strings ( seq -- str )