Fix even more usings

diff --git a/basis/alien/structs/structs-docs.factor b/basis/alien/structs/structs-docs.factor
index 62b8510d1723bf140266355928b760130410b8bf..2f7a7eadc8a2917030e510fdba2349710a143be1 100644 (file)
--- a/basis/alien/structs/structs-docs.factor
+++ b/basis/alien/structs/structs-docs.factor
@@ -1,6 +1,5 @@
-USING: accessors alien.c-types strings help.markup help.syntax
-alien.syntax sequences io arrays kernel words assocs namespaces
-accessors ;
+USING: alien.c-types strings help.markup help.syntax alien.syntax
+sequences io arrays kernel words assocs namespaces ;
 IN: alien.structs
 
 ARTICLE: "c-structs" "C structure types"

diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor
index 68c7b23302b445e1e69ceb730e52724d9c8d133d..d76588e4e461c4870d0106054278a1747554a96b 100644 (file)
--- a/basis/bootstrap/image/image.factor
+++ b/basis/bootstrap/image/image.factor
@@ -1,15 +1,14 @@
 ! Copyright (C) 2004, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien arrays byte-arrays generic hashtables
-hashtables.private io io.binary io.files io.encodings.binary
-io.pathnames kernel kernel.private math namespaces make parser
-prettyprint sequences sequences.private strings sbufs vectors words
-quotations assocs system layouts splitting grouping growable classes
-classes.builtin classes.tuple classes.tuple.private vocabs
-vocabs.loader source-files definitions debugger quotations.private
-sequences.private combinators math.order math.private accessors
-slots.private generic.single.private compiler.units compiler.constants
-fry bootstrap.image.syntax ;
+USING: alien arrays byte-arrays generic hashtables hashtables.private
+io io.binary io.files io.encodings.binary io.pathnames kernel
+kernel.private math namespaces make parser prettyprint sequences
+strings sbufs vectors words quotations assocs system layouts splitting
+grouping growable classes classes.builtin classes.tuple
+classes.tuple.private vocabs vocabs.loader source-files definitions
+debugger quotations.private combinators math.order math.private
+accessors slots.private generic.single.private compiler.units
+compiler.constants fry bootstrap.image.syntax ;
 IN: bootstrap.image
 
 : arch ( os cpu -- arch )

diff --git a/basis/cocoa/messages/messages.factor b/basis/cocoa/messages/messages.factor
index fdd4ba81d75d6e88ef1dfdc46c6c22b520cf61fa..a3fa788f209986f9edb9d92b9fd63d0fcab7fa15 100644 (file)
--- a/basis/cocoa/messages/messages.factor
+++ b/basis/cocoa/messages/messages.factor
@@ -2,9 +2,9 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.strings arrays assocs
 continuations combinators compiler compiler.alien stack-checker kernel
-math namespaces make parser quotations sequences strings words
+math namespaces make quotations sequences strings words
 cocoa.runtime io macros memoize io.encodings.utf8 effects libc
-libc.private parser lexer init core-foundation fry generalizations
+libc.private lexer init core-foundation fry generalizations
 specialized-arrays.direct.alien ;
 IN: cocoa.messages
 

diff --git a/basis/core-foundation/data/data.factor b/basis/core-foundation/data/data.factor
index c708eacecc8ff5ac2c774d9e759f8e27aafb0adf..ef5973888edf872cc898ba16c80ccc15bfa756b4 100644 (file)
--- a/basis/core-foundation/data/data.factor
+++ b/basis/core-foundation/data/data.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2008 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.c-types alien.syntax core-foundation.numbers kernel math
-sequences core-foundation.numbers ;
+USING: alien.c-types alien.syntax kernel math sequences ;
 IN: core-foundation.data
 
 TYPEDEF: void* CFDataRef

diff --git a/basis/io/sockets/unix/unix.factor b/basis/io/sockets/unix/unix.factor
index 6ba7ca2322f237a314a3b88483fa7f9f74a676f2..fe136cd88732b63636a410f0d9ad228944d109fe 100644 (file)
--- a/basis/io/sockets/unix/unix.factor
+++ b/basis/io/sockets/unix/unix.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2004, 2008 Slava Pestov, Ivan Tikhonov. 
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.strings generic kernel math threads
-sequences byte-arrays io.ports io.binary io.backend.unix
-io.streams.duplex io.backend io.ports io.pathnames io.files.private
-io.encodings.utf8 math.parser continuations libc combinators system
-accessors destructors unix locals init ;
+sequences byte-arrays io.binary io.backend.unix io.streams.duplex
+io.backend io.pathnames io.files.private io.encodings.utf8 math.parser
+continuations libc combinators system accessors destructors unix
+locals init ;
 
 EXCLUDE: namespaces => bind ;
 EXCLUDE: io => read write ;

diff --git a/basis/peg/peg.factor b/basis/peg/peg.factor
index c76ca7ac9c4000ef88df377a124695798cb960c4..12e6d59fc01885484737f7ea572688b851df947d 100644 (file)
--- a/basis/peg/peg.factor
+++ b/basis/peg/peg.factor
@@ -3,7 +3,7 @@
 USING: kernel sequences strings fry namespaces make math assocs
 io vectors arrays math.parser math.order combinators
 classes sets unicode.categories compiler.units parser words
-quotations effects memoize accessors locals effects splitting
+quotations memoize accessors locals splitting
 combinators.short-circuit generalizations ;
 IN: peg
 

diff --git a/basis/tools/memory/memory.factor b/basis/tools/memory/memory.factor
index 3d9166aafa5a3fc30bbe22fd5032a878a10def1a..81785f7ea47875d8a684b13b0893079d278e8ce1 100644 (file)
--- a/basis/tools/memory/memory.factor
+++ b/basis/tools/memory/memory.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences vectors arrays generic assocs io math
-namespaces parser prettyprint strings io.styles vectors words
+USING: kernel sequences arrays generic assocs io math
+namespaces parser prettyprint strings io.styles words
 system sorting splitting grouping math.parser classes memory
 combinators fry ;
 IN: tools.memory

diff --git a/basis/ui/text/text.factor b/basis/ui/text/text.factor
index c1f05182e6f4f44206584dbe1254f607f918b3dd..6d5c7e56a6e3e93c3128861de533b0a9d4cfdc60 100755 (executable)
--- a/basis/ui/text/text.factor
+++ b/basis/ui/text/text.factor
@@ -73,7 +73,7 @@ M: array draw-text
         ] with each
     ] do-matrix ;
 
-USING: vocabs.loader namespaces system combinators ;
+USING: vocabs.loader system combinators ;
 
 {
     { [ os macosx? ] [ "core-text" ] }

diff --git a/basis/ui/tools/debugger/debugger.factor b/basis/ui/tools/debugger/debugger.factor
index cf86ce4223882f0328bb0d67821b44cf1eff60b0..024442a2647ae2f1ccf874c54a95700cc2aa9d63 100755 (executable)
--- a/basis/ui/tools/debugger/debugger.factor
+++ b/basis/ui/tools/debugger/debugger.factor
@@ -1,12 +1,11 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays hashtables io kernel math models
-colors.constants namespaces sequences words continuations
-debugger prettyprint help editors fonts ui ui.commands ui.gestures
-ui.gadgets ui.pens.solid ui.gadgets.worlds ui.gadgets.packs
-ui.gadgets.buttons ui.gadgets.labels ui.gadgets.panes
-ui.gadgets.presentations ui.gadgets.viewports ui.gadgets.tables
-ui.gadgets.tracks ui.gadgets.scrollers ui.gadgets.panes
+colors.constants namespaces sequences words continuations debugger
+prettyprint help editors fonts ui ui.commands ui.gestures ui.gadgets
+ui.pens.solid ui.gadgets.worlds ui.gadgets.packs ui.gadgets.buttons
+ui.gadgets.labels ui.gadgets.presentations ui.gadgets.viewports
+ui.gadgets.tables ui.gadgets.tracks ui.gadgets.scrollers
 ui.gadgets.borders ui.gadgets.status-bar ui.tools.traceback
 ui.tools.inspector ui.tools.browser ui.debugger ;
 IN: ui.tools.debugger

diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor
index 779ae64d485b3ee293c251183b5217d697a995df..318a56627bbd0e4ef90e9062b3673efd133a274e 100644 (file)
--- a/basis/unicode/data/data.factor
+++ b/basis/unicode/data/data.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators.short-circuit assocs math kernel sequences
 io.files hashtables quotations splitting grouping arrays io
-math.parser hash2 math.order byte-arrays words namespaces words
+math.parser hash2 math.order byte-arrays namespaces
 compiler.units parser io.encodings.ascii values interval-maps
 ascii sets combinators locals math.ranges sorting make
 strings.parser io.encodings.utf8 memoize simple-flat-file ;

diff --git a/basis/unix/process/process.factor b/basis/unix/process/process.factor
index 9819e50843483e252382d25603dd2a09503bfe56..da8b1e63e3f11f7eafacc778486c0aed12238f05 100644 (file)
--- a/basis/unix/process/process.factor
+++ b/basis/unix/process/process.factor
@@ -1,6 +1,6 @@
-USING: kernel alien.c-types alien.strings sequences math alien.syntax unix
-vectors namespaces continuations threads assocs vectors
-io.backend.unix io.encodings.utf8 unix.utilities fry ;
+USING: kernel alien.c-types alien.strings sequences math alien.syntax
+unix namespaces continuations threads assocs io.backend.unix
+io.encodings.utf8 unix.utilities fry ;
 IN: unix.process
 
 ! Low-level Unix process launching utilities. These are used

diff --git a/core/classes/classes-docs.factor b/core/classes/classes-docs.factor
index f8a2ff415c734f183d76c788e29cd1ea3ed1a8cf..109a3b8089d58038cdf889c5d1ab169899823006 100644 (file)
--- a/core/classes/classes-docs.factor
+++ b/core/classes/classes-docs.factor
@@ -1,6 +1,6 @@
 USING: help.markup help.syntax kernel kernel.private
-namespaces sequences words arrays layouts effects math
-layouts classes.private classes.union classes.mixin
+namespaces sequences words arrays effects math
+classes.private classes.union classes.mixin
 classes.predicate quotations ;
 IN: classes
 

diff --git a/core/classes/intersection/intersection-docs.factor b/core/classes/intersection/intersection-docs.factor
index e9ca706d63924871353b2b166b22b6a80aab18b3..fbd41f5407ea39c4ce75b65541f00c7e026bf214 100644 (file)
--- a/core/classes/intersection/intersection-docs.factor
+++ b/core/classes/intersection/intersection-docs.factor
@@ -1,5 +1,5 @@
 USING: generic help.markup help.syntax kernel kernel.private
-namespaces sequences words arrays layouts help effects math
+namespaces sequences words arrays help effects math
 layouts classes.private classes compiler.units ;
 IN: classes.intersection
 

diff --git a/core/classes/union/union-docs.factor b/core/classes/union/union-docs.factor
index 3d7312a88986ebc16b38bd91fdc27fd0c6c45508..4117010fff015593943295e54dae1c327c8f11b7 100644 (file)
--- a/core/classes/union/union-docs.factor
+++ b/core/classes/union/union-docs.factor
@@ -1,6 +1,6 @@
 USING: generic help.markup help.syntax kernel kernel.private
-namespaces sequences words arrays layouts help effects math
-layouts classes.private classes compiler.units ;
+namespaces sequences words arrays help effects math
+classes.private classes compiler.units ;
 IN: classes.union
 
 ARTICLE: "unions" "Union classes"

diff --git a/core/slots/slots-docs.factor b/core/slots/slots-docs.factor
index 348e2ec2b29e92fd1845fb2ef09f80d918f798c9..eb0e07c71d7547a3f2eadc347ff39701eb60c574 100644 (file)
--- a/core/slots/slots-docs.factor
+++ b/core/slots/slots-docs.factor
@@ -1,5 +1,5 @@
-USING: help.markup help.syntax generic kernel.private parser words
-kernel quotations namespaces sequences words arrays effects
+USING: help.markup help.syntax generic kernel.private parser
+kernel quotations namespaces sequences arrays effects
 generic.standard classes.builtin slots.private classes strings math
 assocs byte-arrays alien classes.tuple ;
 IN: slots

diff --git a/core/syntax/syntax-docs.factor b/core/syntax/syntax-docs.factor
index cd5a325b5245eab6ab088f206a2a0e215c2571c3..d408da4bc742e4ef5181a64cee00756dbf39c21f 100644 (file)
--- a/core/syntax/syntax-docs.factor
+++ b/core/syntax/syntax-docs.factor
@@ -1,8 +1,7 @@
 USING: generic help.syntax help.markup kernel math parser words
-effects classes generic.standard classes.tuple generic.math
-generic.standard generic.single arrays io.pathnames vocabs.loader io
-sequences assocs words.symbol words.alias words.constant combinators 
-vocabs.parser ;
+effects classes classes.tuple generic.math generic.single arrays
+io.pathnames vocabs.loader io sequences assocs words.symbol
+words.alias words.constant combinators vocabs.parser ;
 IN: syntax
 
 ARTICLE: "parser-algorithm" "Parser algorithm"