From 12216b1246626ab0f142c4ab03e4803db5aea2bd Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Tue, 5 Mar 2013 10:48:14 -0800
Subject: [PATCH] core: some more cleanup of USING lists.

---
 core/classes/intersection/intersection.factor |  6 +++---
 core/classes/maybe/maybe.factor               |  2 +-
 core/classes/mixin/mixin.factor               |  8 ++++----
 core/classes/parser/parser.factor             |  2 +-
 core/classes/predicate/predicate.factor       |  5 ++---
 core/classes/singleton/singleton.factor       |  5 ++---
 core/classes/tuple/parser/parser.factor       |  6 +++---
 core/classes/tuple/tuple.factor               | 11 +++++------
 core/classes/union/union.factor               |  6 +++---
 9 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/core/classes/intersection/intersection.factor b/core/classes/intersection/intersection.factor
index 32e0741323..543de2d9c0 100644
--- a/core/classes/intersection/intersection.factor
+++ b/core/classes/intersection/intersection.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2004, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: words accessors sequences kernel assocs combinators
-classes classes.private classes.algebra classes.algebra.private
-classes.builtin namespaces arrays math quotations make ;
+USING: accessors assocs classes classes.algebra
+classes.algebra.private classes.builtin classes.private
+combinators kernel make sequences words ;
 IN: classes.intersection
 
 PREDICATE: intersection-class < class
diff --git a/core/classes/maybe/maybe.factor b/core/classes/maybe/maybe.factor
index 8678c1991c..1c1d24a102 100644
--- a/core/classes/maybe/maybe.factor
+++ b/core/classes/maybe/maybe.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors classes classes.algebra
 classes.algebra.private classes.private classes.union.private
-effects kernel words sequences arrays ;
+kernel words ;
 IN: classes.maybe
 
 ! The class slot has to be a union of a word and a classoid
diff --git a/core/classes/mixin/mixin.factor b/core/classes/mixin/mixin.factor
index 706651cacf..f2c16b1b16 100644
--- a/core/classes/mixin/mixin.factor
+++ b/core/classes/mixin/mixin.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2004, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: classes classes.private classes.algebra
-classes.algebra.private classes.union classes.union.private
-words kernel sequences definitions combinators arrays assocs
-generic accessors ;
+USING: accessors assocs classes classes.algebra
+classes.algebra.private classes.private classes.union
+classes.union.private combinators definitions kernel sequences
+words ;
 IN: classes.mixin
 
 PREDICATE: mixin-class < union-class "mixin" word-prop ;
diff --git a/core/classes/parser/parser.factor b/core/classes/parser/parser.factor
index f7b3801390..fe5265e8bf 100644
--- a/core/classes/parser/parser.factor
+++ b/core/classes/parser/parser.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: parser vocabs.parser words kernel classes compiler.units lexer ;
+USING: classes compiler.units kernel parser vocabs.parser words ;
 IN: classes.parser
 
 : save-class-location ( class -- )
diff --git a/core/classes/predicate/predicate.factor b/core/classes/predicate/predicate.factor
index 5005a46878..068311bf4d 100644
--- a/core/classes/predicate/predicate.factor
+++ b/core/classes/predicate/predicate.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2004, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: classes classes.private classes.algebra
-classes.algebra.private kernel namespaces make words sequences
-quotations arrays kernel.private assocs combinators ;
+USING: classes classes.algebra classes.algebra.private
+classes.private kernel make words ;
 IN: classes.predicate
 
 PREDICATE: predicate-class < class
diff --git a/core/classes/singleton/singleton.factor b/core/classes/singleton/singleton.factor
index 2ef42fd7e7..57206a82cc 100644
--- a/core/classes/singleton/singleton.factor
+++ b/core/classes/singleton/singleton.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2008, 2010 Doug Coleman, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: classes classes.algebra classes.algebra.private
-classes.predicate classes.predicate.private kernel sequences
-words vocabs.parser accessors ;
+USING: classes classes.algebra.private classes.predicate
+classes.predicate.private kernel sequences words ;
 IN: classes.singleton
 
 <PRIVATE
diff --git a/core/classes/tuple/parser/parser.factor b/core/classes/tuple/parser/parser.factor
index 701a4b7604..3ecf70a84d 100644
--- a/core/classes/tuple/parser/parser.factor
+++ b/core/classes/tuple/parser/parser.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel sets namespaces make sequences parser
-lexer combinators words classes.parser classes.tuple arrays
-slots math assocs parser.notes classes classes.algebra ;
+USING: accessors arrays assocs classes.parser classes.tuple
+combinators kernel lexer make parser parser.notes sequences
+sets slots ;
 IN: classes.tuple.parser
 
 : slot-names ( slots -- seq )
diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor
index 6c940f5c6a..818bc4135c 100644
--- a/core/classes/tuple/tuple.factor
+++ b/core/classes/tuple/tuple.factor
@@ -1,11 +1,10 @@
 ! Copyright (C) 2005, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays definitions hashtables kernel kernel.private math
-namespaces make sequences sequences.private strings vectors
-words quotations memory combinators generic classes
-classes.algebra classes.algebra.private classes.builtin
-classes.private slots.private slots math.private accessors
-assocs effects ;
+USING: accessors arrays assocs classes classes.algebra
+classes.algebra.private classes.builtin classes.private
+combinators definitions effects generic kernel kernel.private
+make math math.private memory namespaces quotations sequences
+sequences.private slots slots.private strings words ;
 IN: classes.tuple
 
 PREDICATE: tuple-class < class
diff --git a/core/classes/union/union.factor b/core/classes/union/union.factor
index b4e59a4a7e..13563a1178 100644
--- a/core/classes/union/union.factor
+++ b/core/classes/union/union.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2004, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs classes classes.algebra
-classes.algebra.private classes.builtin
-classes.private combinators definitions kernel kernel.private
-math math.private quotations sequences words vocabs ;
+classes.algebra.private classes.builtin classes.private
+combinators definitions kernel kernel.private math math.private
+quotations sequences words ;
 IN: classes.union
 
 PREDICATE: union-class < class