From: Doug Coleman <doug.coleman@gmail.com>
Date: Wed, 12 Aug 2015 16:24:26 +0000 (-0500)
Subject: factor: don't need FROM: namespaces => set or namespaces:set anymore
X-Git-Tag: unmaintained~2114
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=e0d1b14e5c222fb4b8f7d49b7cd97ab8551adac4

factor: don't need FROM: namespaces => set or namespaces:set anymore
---

diff --git a/basis/compiler/cfg/alias-analysis/alias-analysis.factor b/basis/compiler/cfg/alias-analysis/alias-analysis.factor
index 9c44264f2b..9243af28d2 100644
--- a/basis/compiler/cfg/alias-analysis/alias-analysis.factor
+++ b/basis/compiler/cfg/alias-analysis/alias-analysis.factor
@@ -5,7 +5,6 @@ compiler.cfg.comparisons compiler.cfg.instructions
 compiler.cfg.representations.preferred compiler.cfg.rpo
 compiler.cfg.utilities cpu.architecture fry kernel locals math
 namespaces sequences sets ;
-QUALIFIED: namespaces
 IN: compiler.cfg.alias-analysis
 
 ! Local copy propagation
@@ -126,13 +125,13 @@ SYMBOL: ac-counter
     ] [ vreg kill-computed-set-slot ] if ;
 
 : init-alias-analysis ( -- )
-    H{ } clone vregs>acs namespaces:set
-    H{ } clone acs>vregs namespaces:set
-    H{ } clone live-slots namespaces:set
-    H{ } clone copies namespaces:set
-    H{ } clone recent-stores namespaces:set
-    HS{ } clone dead-stores namespaces:set
-    0 ac-counter namespaces:set ;
+    H{ } clone vregs>acs set
+    H{ } clone acs>vregs set
+    H{ } clone live-slots set
+    H{ } clone copies set
+    H{ } clone recent-stores set
+    HS{ } clone dead-stores set
+    0 ac-counter set ;
 
 GENERIC: insn-slot# ( insn -- slot#/f )
 GENERIC: insn-object ( insn -- vreg )
@@ -256,7 +255,7 @@ M: insn eliminate-dead-stores drop t ;
     copies get clear-assoc
     dead-stores get clear-set
 
-    next-ac heap-ac namespaces:set
+    next-ac heap-ac set
     ##vm-field set-new-ac
     ##alien-global set-new-ac ;
 
diff --git a/basis/compiler/cfg/branch-splitting/branch-splitting.factor b/basis/compiler/cfg/branch-splitting/branch-splitting.factor
index e01f66c292..78af21546a 100644
--- a/basis/compiler/cfg/branch-splitting/branch-splitting.factor
+++ b/basis/compiler/cfg/branch-splitting/branch-splitting.factor
@@ -5,7 +5,6 @@ compiler.cfg compiler.cfg.instructions compiler.cfg.predecessors
 compiler.cfg.renaming compiler.cfg.rpo compiler.cfg.utilities
 deques dlists fry kernel locals math namespaces sequences sets
 vectors ;
-QUALIFIED: namespaces
 IN: compiler.cfg.branch-splitting
 
 : clone-instructions ( insns -- insns' )
@@ -86,8 +85,8 @@ SYMBOL: visited
     [ worklist get push-front ] [ drop ] if ;
 
 : init-worklist ( cfg -- )
-    <dlist> worklist namespaces:set
-    HS{ } clone visited namespaces:set
+    <dlist> worklist set
+    HS{ } clone visited set
     entry>> add-to-worklist ;
 
 : split-branches ( cfg -- )
diff --git a/basis/compiler/cfg/copy-prop/copy-prop.factor b/basis/compiler/cfg/copy-prop/copy-prop.factor
index 50da49adb7..e205734110 100644
--- a/basis/compiler/cfg/copy-prop/copy-prop.factor
+++ b/basis/compiler/cfg/copy-prop/copy-prop.factor
@@ -4,7 +4,6 @@ USING: accessors assocs compiler.cfg.def-use
 compiler.cfg.instructions compiler.cfg.predecessors
 compiler.cfg.renaming compiler.cfg.rpo compiler.cfg.utilities
 fry grouping kernel namespaces sequences ;
-FROM: namespaces => set ;
 IN: compiler.cfg.copy-prop
 
 <PRIVATE
diff --git a/basis/compiler/cfg/dce/dce.factor b/basis/compiler/cfg/dce/dce.factor
index 14399886ee..8a515e1e90 100644
--- a/basis/compiler/cfg/dce/dce.factor
+++ b/basis/compiler/cfg/dce/dce.factor
@@ -3,7 +3,6 @@
 USING: accessors arrays assocs combinators compiler.cfg.def-use
 compiler.cfg.instructions compiler.cfg.predecessors
 compiler.cfg.rpo kernel namespaces sequences sets ;
-FROM: namespaces => set ;
 IN: compiler.cfg.dce
 
 ! Maps vregs to sequences of vregs
diff --git a/basis/compiler/cfg/def-use/def-use.factor b/basis/compiler/cfg/def-use/def-use.factor
index dfa0ba083c..7b88a1ca92 100644
--- a/basis/compiler/cfg/def-use/def-use.factor
+++ b/basis/compiler/cfg/def-use/def-use.factor
@@ -4,7 +4,6 @@ USING: accessors arrays assocs combinators compiler.cfg
 compiler.cfg.instructions compiler.cfg.instructions.syntax
 compiler.cfg.rpo compiler.units fry generic kernel namespaces
 quotations sequences sequences.generalizations sets slots words ;
-FROM: namespaces => set ;
 IN: compiler.cfg.def-use
 
 ! Utilities for iterating over instruction operands
diff --git a/basis/compiler/cfg/dominance/dominance.factor b/basis/compiler/cfg/dominance/dominance.factor
index 79bcb47f75..54f7a80c17 100644
--- a/basis/compiler/cfg/dominance/dominance.factor
+++ b/basis/compiler/cfg/dominance/dominance.factor
@@ -3,7 +3,6 @@
 USING: accessors assocs combinators compiler.cfg.predecessors
 compiler.cfg.rpo deques dlists fry kernel locals math math.order
 namespaces sequences sorting vectors ;
-FROM: namespaces => set ;
 IN: compiler.cfg.dominance
 
 <PRIVATE
diff --git a/basis/compiler/cfg/linear-scan/assignment/assignment.factor b/basis/compiler/cfg/linear-scan/assignment/assignment.factor
index f35e0a5c99..81cbfa4cf7 100644
--- a/basis/compiler/cfg/linear-scan/assignment/assignment.factor
+++ b/basis/compiler/cfg/linear-scan/assignment/assignment.factor
@@ -6,7 +6,6 @@ compiler.cfg.instructions compiler.cfg.linear-scan.allocation.state
 compiler.cfg.linear-scan.live-intervals compiler.cfg.renaming.functor
 compiler.cfg.ssa.destruction.leaders cpu.architecture
 fry heaps kernel make math namespaces sequences sets ;
-FROM: namespaces => set ;
 IN: compiler.cfg.linear-scan.assignment
 
 ! This contains both active and inactive intervals; any interval
diff --git a/basis/compiler/cfg/linear-scan/linear-scan-tests.factor b/basis/compiler/cfg/linear-scan/linear-scan-tests.factor
index 0fb9f050ff..ada660c969 100644
--- a/basis/compiler/cfg/linear-scan/linear-scan-tests.factor
+++ b/basis/compiler/cfg/linear-scan/linear-scan-tests.factor
@@ -21,7 +21,6 @@ compiler.cfg.linear-scan.allocation.splitting
 compiler.cfg.linear-scan.allocation.spilling
 compiler.cfg.linear-scan.debugger
 compiler.cfg.utilities ;
-FROM: namespaces => set ;
 IN: compiler.cfg.linear-scan.tests
 
 check-allocation? on
diff --git a/basis/compiler/cfg/linearization/linearization.factor b/basis/compiler/cfg/linearization/linearization.factor
index c20be464f1..b5abf84fed 100644
--- a/basis/compiler/cfg/linearization/linearization.factor
+++ b/basis/compiler/cfg/linearization/linearization.factor
@@ -4,7 +4,6 @@ USING: accessors assocs combinators combinators.short-circuit
 compiler.cfg.loop-detection compiler.cfg.predecessors
 compiler.cfg.rpo compiler.cfg.utilities deques dlists fry kernel
 make math namespaces sequences sets sorting ;
-FROM: namespaces => set ;
 IN: compiler.cfg.linearization
 
 ! This is RPO except loops are rotated and unlikely blocks go
diff --git a/basis/compiler/cfg/liveness/liveness.factor b/basis/compiler/cfg/liveness/liveness.factor
index 33518b89d6..67c5cb3b9c 100644
--- a/basis/compiler/cfg/liveness/liveness.factor
+++ b/basis/compiler/cfg/liveness/liveness.factor
@@ -6,7 +6,6 @@ compiler.cfg.registers compiler.cfg.rpo
 compiler.cfg.ssa.destruction.leaders compiler.cfg.utilities
 cpu.architecture deques dlists fry kernel locals namespaces
 sequences sets ;
-FROM: namespaces => set ;
 IN: compiler.cfg.liveness
 
 SYMBOL: live-ins
diff --git a/basis/compiler/cfg/loop-detection/loop-detection.factor b/basis/compiler/cfg/loop-detection/loop-detection.factor
index a8a90377ef..7e4ccdac8f 100644
--- a/basis/compiler/cfg/loop-detection/loop-detection.factor
+++ b/basis/compiler/cfg/loop-detection/loop-detection.factor
@@ -3,7 +3,6 @@
 USING: accessors assocs combinators.short-circuit compiler.cfg
 compiler.cfg.predecessors compiler.cfg.utilities deques dlists fry kernel
 namespaces sequences sets ;
-FROM: namespaces => set ;
 IN: compiler.cfg.loop-detection
 
 TUPLE: natural-loop header index ends blocks ;
diff --git a/basis/compiler/cfg/representations/preferred/preferred.factor b/basis/compiler/cfg/representations/preferred/preferred.factor
index 99a91f6be0..2a8805edee 100644
--- a/basis/compiler/cfg/representations/preferred/preferred.factor
+++ b/basis/compiler/cfg/representations/preferred/preferred.factor
@@ -6,7 +6,6 @@ generic kernel namespaces sequences sequences.generalizations
 sets words ;
 FROM: compiler.cfg.instructions.syntax => insn-def-slots
 insn-use-slots insn-temp-slots scalar-rep ;
-FROM: namespaces => set ;
 IN: compiler.cfg.representations.preferred
 
 GENERIC: defs-vreg-reps ( insn -- reps )
diff --git a/basis/compiler/cfg/representations/selection/selection.factor b/basis/compiler/cfg/representations/selection/selection.factor
index 15d4a53baa..827e4ea994 100644
--- a/basis/compiler/cfg/representations/selection/selection.factor
+++ b/basis/compiler/cfg/representations/selection/selection.factor
@@ -8,7 +8,6 @@ compiler.cfg.representations.preferred compiler.cfg.rpo
 compiler.cfg.utilities compiler.utilities cpu.architecture
 disjoint-sets fry kernel locals math math.functions namespaces
 sequences sets ;
-FROM: namespaces => set ;
 IN: compiler.cfg.representations.selection
 
 SYMBOL: tagged-vregs
diff --git a/basis/compiler/cfg/rpo/rpo.factor b/basis/compiler/cfg/rpo/rpo.factor
index c64952b899..0a36c5decc 100644
--- a/basis/compiler/cfg/rpo/rpo.factor
+++ b/basis/compiler/cfg/rpo/rpo.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors compiler.cfg fry kernel make sequences sets ;
-FROM: namespaces => set ;
+USING: accessors compiler.cfg fry kernel make namespaces
+sequences sets ;
 IN: compiler.cfg.rpo
 
 : post-order-traversal ( visited bb -- visited )
diff --git a/basis/compiler/cfg/ssa/construction/construction.factor b/basis/compiler/cfg/ssa/construction/construction.factor
index 0180821c16..73fc2c1a0f 100644
--- a/basis/compiler/cfg/ssa/construction/construction.factor
+++ b/basis/compiler/cfg/ssa/construction/construction.factor
@@ -4,9 +4,8 @@ USING: accessors assocs combinators compiler.cfg
 compiler.cfg.def-use compiler.cfg.dominance
 compiler.cfg.instructions compiler.cfg.registers
 compiler.cfg.renaming.functor compiler.cfg.rpo
-compiler.cfg.ssa.construction.tdmsc compiler.cfg.utilities deques dlists fry
-kernel math sequences sets ;
-FROM: namespaces => set get ;
+compiler.cfg.ssa.construction.tdmsc deques dlists fry kernel
+math namespaces sequences sets ;
 IN: compiler.cfg.ssa.construction
 
 <PRIVATE
diff --git a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc-tests.factor b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc-tests.factor
index 7b6100ed69..20577afb96 100644
--- a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc-tests.factor
+++ b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc-tests.factor
@@ -1,8 +1,6 @@
 USING: accessors arrays compiler.cfg compiler.cfg.debugger
-compiler.cfg.dominance compiler.cfg.predecessors
-compiler.cfg.ssa.construction.tdmsc compiler.cfg.utilities kernel namespaces
-sequences sets tools.test vectors ;
-FROM: namespaces => set ;
+compiler.cfg.ssa.construction.tdmsc compiler.cfg.utilities
+kernel namespaces sequences sets tools.test ;
 IN: compiler.cfg.ssa.construction.tdmsc.tests
 
 : test-tdmsc ( -- )
diff --git a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor
index 7ba39682e6..d090619ca7 100644
--- a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor
+++ b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor
@@ -3,7 +3,6 @@
 USING: accessors arrays assocs bit-sets compiler.cfg
 compiler.cfg.dominance compiler.cfg.rpo compiler.cfg.utilities
 fry hashtables kernel locals math namespaces sequences sets ;
-FROM: namespaces => set ;
 IN: compiler.cfg.ssa.construction.tdmsc
 
 ! TDMSC-I algorithm from "A Practical and Fast Iterative Algorithm for
diff --git a/basis/compiler/cfg/ssa/destruction/coalescing/coalescing.factor b/basis/compiler/cfg/ssa/destruction/coalescing/coalescing.factor
index f8ec363c21..c9e88cd83d 100644
--- a/basis/compiler/cfg/ssa/destruction/coalescing/coalescing.factor
+++ b/basis/compiler/cfg/ssa/destruction/coalescing/coalescing.factor
@@ -3,7 +3,6 @@ compiler.cfg.instructions compiler.cfg.linearization
 compiler.cfg.registers compiler.cfg.ssa.destruction.leaders
 compiler.cfg.ssa.interference cpu.architecture fry kernel make
 namespaces sequences sets sorting ;
-FROM: namespaces => set ;
 IN: compiler.cfg.ssa.destruction.coalescing
 
 : zip-scalar ( scalar seq -- pairs )
diff --git a/basis/compiler/cfg/ssa/destruction/destruction.factor b/basis/compiler/cfg/ssa/destruction/destruction.factor
index b4d325e49a..2befab985e 100644
--- a/basis/compiler/cfg/ssa/destruction/destruction.factor
+++ b/basis/compiler/cfg/ssa/destruction/destruction.factor
@@ -5,8 +5,7 @@ compiler.cfg.instructions compiler.cfg.liveness
 compiler.cfg.parallel-copy compiler.cfg.rpo compiler.cfg.ssa.cssa
 compiler.cfg.ssa.destruction.coalescing compiler.cfg.ssa.destruction.leaders
 compiler.cfg.ssa.interference.live-ranges compiler.cfg.utilities
-kernel make sequences ;
-FROM: namespaces => set ;
+kernel make sequences namespaces ;
 IN: compiler.cfg.ssa.destruction
 
 <PRIVATE
diff --git a/basis/compiler/cfg/stacks/local/local.factor b/basis/compiler/cfg/stacks/local/local.factor
index 7b1abd8d84..5f8bd10aa0 100644
--- a/basis/compiler/cfg/stacks/local/local.factor
+++ b/basis/compiler/cfg/stacks/local/local.factor
@@ -4,7 +4,6 @@ USING: accessors arrays assocs combinators compiler.cfg
 compiler.cfg.instructions compiler.cfg.parallel-copy
 compiler.cfg.registers compiler.cfg.stacks.height
 fry hash-sets kernel make math math.order namespaces sequences sets ;
-FROM: namespaces => set ;
 IN: compiler.cfg.stacks.local
 
 : current-height ( state -- ds rs )
diff --git a/basis/compiler/cfg/write-barrier/write-barrier.factor b/basis/compiler/cfg/write-barrier/write-barrier.factor
index 2c2c71f789..47d1cf9913 100644
--- a/basis/compiler/cfg/write-barrier/write-barrier.factor
+++ b/basis/compiler/cfg/write-barrier/write-barrier.factor
@@ -3,7 +3,6 @@
 USING: accessors assocs combinators.short-circuit
 compiler.cfg.instructions compiler.cfg.rpo kernel namespaces
 sequences sets ;
-FROM: namespaces => set ;
 IN: compiler.cfg.write-barrier
 
 ! This pass must run after GC check insertion and scheduling.
diff --git a/basis/compiler/codegen/codegen.factor b/basis/compiler/codegen/codegen.factor
index e3f339adfb..c48f3d5b94 100755
--- a/basis/compiler/codegen/codegen.factor
+++ b/basis/compiler/codegen/codegen.factor
@@ -8,7 +8,6 @@ compiler.codegen.relocation compiler.constants cpu.architecture
 fry generic.parser kernel layouts locals make math namespaces
 parser quotations sequences sequences.generalizations slots
 words ;
-FROM: namespaces => set ;
 IN: compiler.codegen
 
 SYMBOL: insn-counts
diff --git a/basis/compiler/tree/checker/checker.factor b/basis/compiler/tree/checker/checker.factor
index c82e110602..03249db124 100644
--- a/basis/compiler/tree/checker/checker.factor
+++ b/basis/compiler/tree/checker/checker.factor
@@ -4,7 +4,6 @@ USING: accessors arrays assocs columns combinators compiler.tree
 compiler.tree.combinators compiler.tree.def-use
 compiler.tree.recursive continuations grouping kernel math
 namespaces sequences sets vectors ;
-FROM: namespaces => set ;
 IN: compiler.tree.checker
 
 ! Check some invariants; this can help catch compiler bugs.
diff --git a/basis/compiler/tree/dead-code/branches/branches.factor b/basis/compiler/tree/dead-code/branches/branches.factor
index a4c610f364..90d96f952e 100644
--- a/basis/compiler/tree/dead-code/branches/branches.factor
+++ b/basis/compiler/tree/dead-code/branches/branches.factor
@@ -4,7 +4,6 @@ USING: accessors assocs columns combinators compiler.tree
 compiler.tree.dead-code.liveness compiler.tree.dead-code.simple
 fry kernel namespaces sequences stack-checker.backend
 stack-checker.branches ;
-FROM: namespaces => set ;
 IN: compiler.tree.dead-code.branches
 
 M: #if mark-live-values* look-at-inputs ;
diff --git a/basis/compiler/tree/dead-code/liveness/liveness.factor b/basis/compiler/tree/dead-code/liveness/liveness.factor
index 363fb5c872..234c40ff9f 100644
--- a/basis/compiler/tree/dead-code/liveness/liveness.factor
+++ b/basis/compiler/tree/dead-code/liveness/liveness.factor
@@ -3,7 +3,6 @@
 USING: accessors assocs compiler.tree compiler.tree.combinators
 compiler.tree.def-use compiler.utilities deques dlists kernel
 namespaces sets stack-checker.branches ;
-FROM: namespaces => set ;
 IN: compiler.tree.dead-code.liveness
 
 SYMBOL: work-list
diff --git a/basis/compiler/tree/debugger/debugger.factor b/basis/compiler/tree/debugger/debugger.factor
index e8a7716334..5ea6f03d4f 100644
--- a/basis/compiler/tree/debugger/debugger.factor
+++ b/basis/compiler/tree/debugger/debugger.factor
@@ -14,7 +14,6 @@ prettyprint prettyprint.config prettyprint.custom
 prettyprint.sections quotations sequences sequences.private sets
 sorting words ;
 FROM: fry => _ ;
-FROM: namespaces => set ;
 RENAME: _ match => __
 IN: compiler.tree.debugger
 
diff --git a/basis/compiler/tree/def-use/def-use.factor b/basis/compiler/tree/def-use/def-use.factor
index b630659fc9..d572ba0965 100644
--- a/basis/compiler/tree/def-use/def-use.factor
+++ b/basis/compiler/tree/def-use/def-use.factor
@@ -2,7 +2,6 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs compiler.tree compiler.tree.combinators
 fry kernel namespaces sequences stack-checker.branches ;
-FROM: namespaces => set ;
 QUALIFIED: sets
 IN: compiler.tree.def-use
 
diff --git a/basis/compiler/tree/def-use/simplified/simplified.factor b/basis/compiler/tree/def-use/simplified/simplified.factor
index d92c42fdbd..a92f13ab7b 100644
--- a/basis/compiler/tree/def-use/simplified/simplified.factor
+++ b/basis/compiler/tree/def-use/simplified/simplified.factor
@@ -2,7 +2,6 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors compiler.tree compiler.tree.def-use kernel
 namespaces sequences sets stack-checker.branches ;
-FROM: namespaces => set ;
 IN: compiler.tree.def-use.simplified
 
 ! Simplified def-use follows chains of copies.
diff --git a/basis/compiler/tree/escape-analysis/allocations/allocations.factor b/basis/compiler/tree/escape-analysis/allocations/allocations.factor
index 85e1f42a9b..150a87d25e 100644
--- a/basis/compiler/tree/escape-analysis/allocations/allocations.factor
+++ b/basis/compiler/tree/escape-analysis/allocations/allocations.factor
@@ -2,7 +2,6 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators disjoint-sets fry kernel
 namespaces sequences stack-checker.values ;
-FROM: namespaces => set ;
 IN: compiler.tree.escape-analysis.allocations
 
 SYMBOL: value-classes
diff --git a/basis/compiler/tree/modular-arithmetic/modular-arithmetic.factor b/basis/compiler/tree/modular-arithmetic/modular-arithmetic.factor
index 60117b77c9..fafea21e69 100644
--- a/basis/compiler/tree/modular-arithmetic/modular-arithmetic.factor
+++ b/basis/compiler/tree/modular-arithmetic/modular-arithmetic.factor
@@ -6,7 +6,6 @@ compiler.tree.combinators compiler.tree.def-use.simplified
 compiler.tree.late-optimizations compiler.tree.propagation.info
 fry kernel layouts math math.intervals math.partial-dispatch
 math.private memoize namespaces sequences sets words ;
-FROM: namespaces => set ;
 IN: compiler.tree.modular-arithmetic
 
 ! This is a late-stage optimization.
diff --git a/basis/compiler/tree/recursive/recursive.factor b/basis/compiler/tree/recursive/recursive.factor
index cd00e931fc..86c11a36e7 100644
--- a/basis/compiler/tree/recursive/recursive.factor
+++ b/basis/compiler/tree/recursive/recursive.factor
@@ -2,7 +2,6 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors combinators.short-circuit compiler.tree fry
 kernel namespaces sequences sets ;
-FROM: namespaces => set ;
 IN: compiler.tree.recursive
 
 TUPLE: call-site tail? node label ;
diff --git a/basis/farkup/farkup.factor b/basis/farkup/farkup.factor
index da0834861e..cf505aa7c5 100644
--- a/basis/farkup/farkup.factor
+++ b/basis/farkup/farkup.factor
@@ -4,7 +4,6 @@ USING: sequences kernel splitting lists fry accessors assocs math.order
 math combinators namespaces urls.encoding xml.syntax xmode.code2html
 xml.data arrays strings vectors xml.writer io.streams.string locals
 unicode.categories ;
-FROM: namespaces => set ;
 IN: farkup
 
 SYMBOL: relative-link-prefix
diff --git a/basis/furnace/auth/auth.factor b/basis/furnace/auth/auth.factor
index 81c073529f..b75c53eb8b 100644
--- a/basis/furnace/auth/auth.factor
+++ b/basis/furnace/auth/auth.factor
@@ -14,7 +14,6 @@ furnace.redirection
 furnace.boilerplate
 furnace.auth.providers
 furnace.auth.providers.db ;
-FROM: namespaces => set ;
 IN: furnace.auth
 
 SYMBOL: logged-in-user
diff --git a/basis/help/markup/markup-tests.factor b/basis/help/markup/markup-tests.factor
index 730a9a3b6d..d5ceccaae2 100644
--- a/basis/help/markup/markup-tests.factor
+++ b/basis/help/markup/markup-tests.factor
@@ -1,7 +1,6 @@
 USING: accessors arrays assocs definitions fry generic help
 help.markup io.streams.string kernel math namespaces parser
 sequences sets strings tools.test words ;
-FROM: namespaces => set ;
 IN: help.markup.tests
 
 : with-markup-test ( quot -- )
diff --git a/basis/help/markup/markup.factor b/basis/help/markup/markup.factor
index 5cf6a054a1..61b16ab746 100644
--- a/basis/help/markup/markup.factor
+++ b/basis/help/markup/markup.factor
@@ -9,7 +9,6 @@ quotations see sequences sequences.private sets slots sorting
 splitting strings urls vectors vocabs vocabs.loader words
 words.symbol ;
 FROM: prettyprint.sections => with-pprint ;
-FROM: namespaces => set ;
 IN: help.markup
 
 PREDICATE: simple-element < array
diff --git a/basis/inspector/inspector.factor b/basis/inspector/inspector.factor
index 473707aa74..444b7ed0ba 100644
--- a/basis/inspector/inspector.factor
+++ b/basis/inspector/inspector.factor
@@ -4,7 +4,6 @@ USING: accessors assocs continuations debugger fry hashtables io
 io.styles kernel math mirrors namespaces prettyprint
 prettyprint.custom prettyprint.sections sequences sets sorting
 summary ;
-FROM: namespaces => set ;
 IN: inspector
 
 SYMBOL: +number-rows+
diff --git a/basis/io/monitors/linux/linux.factor b/basis/io/monitors/linux/linux.factor
index ee2f21cd75..ce0f90a863 100755
--- a/basis/io/monitors/linux/linux.factor
+++ b/basis/io/monitors/linux/linux.factor
@@ -6,7 +6,6 @@ io.backend.unix io.encodings.utf8 unix.linux.inotify assocs
 namespaces make threads continuations init libc math math.bitwise
 sets alien alien.strings alien.c-types vocabs.loader accessors
 system hashtables destructors unix classes.struct literals ;
-FROM: namespaces => set ;
 IN: io.monitors.linux
 
 SYMBOL: watches
diff --git a/basis/io/servers/servers.factor b/basis/io/servers/servers.factor
index ef8703eaf2..ccdd15b2ea 100755
--- a/basis/io/servers/servers.factor
+++ b/basis/io/servers/servers.factor
@@ -7,7 +7,6 @@ concurrency.semaphores continuations debugger destructors fry
 io io.sockets io.sockets.secure io.streams.duplex io.styles
 io.timeouts kernel logging make math math.parser namespaces
 present prettyprint random sequences sets strings threads ;
-FROM: namespaces => set ;
 IN: io.servers
 
 TUPLE: threaded-server < identity-tuple
diff --git a/basis/peg/peg.factor b/basis/peg/peg.factor
index 9076ea140f..f08f0359f9 100644
--- a/basis/peg/peg.factor
+++ b/basis/peg/peg.factor
@@ -5,7 +5,6 @@ combinators.short-circuit compiler.units effects.parser fry
 generalizations kernel locals make math math.order namespaces
 quotations sequences sets splitting unicode.categories vectors
 words ;
-FROM: namespaces => set ;
 IN: peg
 
 TUPLE: parse-result remaining ast ;
diff --git a/basis/prettyprint/sections/sections.factor b/basis/prettyprint/sections/sections.factor
index 334639e643..c1d39aaee5 100644
--- a/basis/prettyprint/sections/sections.factor
+++ b/basis/prettyprint/sections/sections.factor
@@ -4,7 +4,6 @@ USING: accessors classes.maybe combinators
 combinators.short-circuit continuations hashtables io io.styles
 kernel make math namespaces prettyprint.config sequences sets
 splitting strings vocabs vocabs.parser words ;
-FROM: namespaces => set ;
 IN: prettyprint.sections
 
 ! State
diff --git a/basis/regexp/nfa/nfa.factor b/basis/regexp/nfa/nfa.factor
index 45fc35a7c0..8203bc122c 100644
--- a/basis/regexp/nfa/nfa.factor
+++ b/basis/regexp/nfa/nfa.factor
@@ -5,7 +5,6 @@ sequences fry quotations math.order math.ranges vectors
 unicode.categories regexp.transition-tables words sets hashtables
 combinators.short-circuit unicode.data regexp.ast
 regexp.classes memoize ;
-FROM: namespaces => set ;
 IN: regexp.nfa
 
 ! This uses unicode.data for ch>upper and ch>lower
diff --git a/basis/see/see.factor b/basis/see/see.factor
index 14cfe5af62..1110568285 100644
--- a/basis/see/see.factor
+++ b/basis/see/see.factor
@@ -8,7 +8,6 @@ io.streams.string io.styles kernel make namespaces prettyprint
 prettyprint.backend prettyprint.config prettyprint.custom
 prettyprint.sections sequences sets slots sorting strings summary
 words words.symbol words.constant words.alias vocabs ;
-FROM: namespaces => set ;
 IN: see
 
 GENERIC: synopsis* ( defspec -- )
diff --git a/basis/stack-checker/backend/backend.factor b/basis/stack-checker/backend/backend.factor
index c5c2a8aa63..781686d9da 100644
--- a/basis/stack-checker/backend/backend.factor
+++ b/basis/stack-checker/backend/backend.factor
@@ -6,7 +6,6 @@ stack-checker.dependencies stack-checker.errors
 stack-checker.recursive-state stack-checker.state
 stack-checker.values stack-checker.visitor words ;
 FROM: sequences.private => from-end ;
-FROM: namespaces => set ;
 IN: stack-checker.backend
 
 : push-d ( obj -- ) meta-d push ;
diff --git a/basis/stack-checker/dependencies/dependencies.factor b/basis/stack-checker/dependencies/dependencies.factor
index 337961b406..72b0cd2cd1 100644
--- a/basis/stack-checker/dependencies/dependencies.factor
+++ b/basis/stack-checker/dependencies/dependencies.factor
@@ -4,7 +4,6 @@ USING: accessors alien.c-types arrays assocs classes
 classes.algebra classes.tuple combinators.short-circuit fry
 generic kernel math namespaces sequences sets words ;
 FROM: classes.tuple.private => tuple-layout ;
-FROM: namespaces => set ;
 IN: stack-checker.dependencies
 
 ! Words that the current quotation depends on
diff --git a/basis/stack-checker/transforms/transforms.factor b/basis/stack-checker/transforms/transforms.factor
index 012059c06c..7460965d6e 100644
--- a/basis/stack-checker/transforms/transforms.factor
+++ b/basis/stack-checker/transforms/transforms.factor
@@ -6,7 +6,6 @@ locals namespaces quotations sequences stack-checker.backend
 stack-checker.dependencies stack-checker.errors
 stack-checker.recursive-state stack-checker.values
 stack-checker.visitor words ;
-FROM: namespaces => set ;
 IN: stack-checker.transforms
 
 : call-transformer ( stack quot -- newquot )
diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index ddd90a799e..73a6e52188 100755
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -23,7 +23,6 @@ QUALIFIED: source-files
 QUALIFIED: source-files.errors
 QUALIFIED: vocabs
 QUALIFIED: vocabs.loader
-FROM: namespaces => set ;
 IN: tools.deploy.shaker
 
 ! This file is some hairy shit.
diff --git a/basis/ui/backend/windows/windows.factor b/basis/ui/backend/windows/windows.factor
index 066dd0d11b..b7cccae853 100755
--- a/basis/ui/backend/windows/windows.factor
+++ b/basis/ui/backend/windows/windows.factor
@@ -14,7 +14,6 @@ accessors math.rectangles math.order calendar ascii sets io.crlf
 io.encodings.utf16n windows.errors literals ui.pixel-formats
 ui.pixel-formats.private memoize classes colors
 specialized-arrays classes.struct ;
-FROM: namespaces => set ;
 SPECIALIZED-ARRAY: POINT
 QUALIFIED-WITH: alien.c-types c
 IN: ui.backend.windows
diff --git a/basis/ui/gadgets/gadgets-tests.factor b/basis/ui/gadgets/gadgets-tests.factor
index 71b605816d..1b3fc4c19e 100644
--- a/basis/ui/gadgets/gadgets-tests.factor
+++ b/basis/ui/gadgets/gadgets-tests.factor
@@ -2,7 +2,6 @@ USING: accessors ui.gadgets ui.gadgets.packs ui.gadgets.worlds
 tools.test namespaces models kernel dlists deques math
 math.parser ui sequences hashtables assocs io arrays prettyprint
 io.streams.string math.rectangles ui.gadgets.private sets generic ;
-FROM: namespaces => set ;
 IN: ui.gadgets.tests
 
 { { 300 300 } }
diff --git a/basis/ui/gestures/gestures.factor b/basis/ui/gestures/gestures.factor
index b0797c1fcf..f92f8de63c 100644
--- a/basis/ui/gestures/gestures.factor
+++ b/basis/ui/gestures/gestures.factor
@@ -5,7 +5,6 @@ namespaces make sequences words strings system hashtables math.parser
 math.vectors classes.tuple classes boxes calendar timers combinators
 sets columns fry deques ui.gadgets ui.gadgets.private ascii
 combinators.short-circuit ;
-FROM: namespaces => set ;
 IN: ui.gestures
 
 : get-gesture-handler ( gesture gadget -- quot )
diff --git a/basis/ui/render/render.factor b/basis/ui/render/render.factor
index 6bc5f0f51f..5f9bcb0e9d 100644
--- a/basis/ui/render/render.factor
+++ b/basis/ui/render/render.factor
@@ -3,7 +3,6 @@
 USING: math.rectangles math.vectors namespaces kernel accessors
 assocs combinators sequences sets opengl opengl.gl colors
 colors.constants ui.gadgets ui.pens ;
-FROM: namespaces => set ;
 IN: ui.render
 
 SYMBOL: clip
diff --git a/basis/vocabs/refresh/refresh.factor b/basis/vocabs/refresh/refresh.factor
index 8faaac7f7d..50b86d9b79 100644
--- a/basis/vocabs/refresh/refresh.factor
+++ b/basis/vocabs/refresh/refresh.factor
@@ -3,7 +3,6 @@
 USING: accessors assocs checksums checksums.crc32
 combinators.short-circuit io.encodings.utf8 io.files kernel
 namespaces sequences sets source-files vocabs vocabs.loader ;
-FROM: namespaces => set ;
 IN: vocabs.refresh
 
 : source-modified? ( path -- ? )
diff --git a/basis/xml/elements/elements.factor b/basis/xml/elements/elements.factor
index 25d66bd8cf..900b59b1a7 100644
--- a/basis/xml/elements/elements.factor
+++ b/basis/xml/elements/elements.factor
@@ -4,7 +4,6 @@ USING: kernel namespaces xml.tokenize xml.state xml.name
 xml.data accessors arrays make xml.char-classes fry assocs sequences
 math xml.errors sets combinators io.encodings io.encodings.iana
 unicode.case xml.dtd strings xml.entities unicode.categories ;
-FROM: namespaces => set ;
 IN: xml.elements
 
 : take-interpolated ( quot -- interpolated )
diff --git a/core/alien/alien-tests.factor b/core/alien/alien-tests.factor
index 7b9e527e8b..766d42bd15 100644
--- a/core/alien/alien-tests.factor
+++ b/core/alien/alien-tests.factor
@@ -2,7 +2,6 @@ USING: accessors alien alien.accessors alien.c-types alien.libraries
 alien.syntax arrays byte-arrays continuations fry kernel kernel.private
 layouts libc math namespaces prettyprint sequences sets system tools.memory
 tools.test ;
-FROM: namespaces => set ;
 IN: alien.tests
 
 { t } [ -1 <alien> alien-address 0 > ] unit-test
diff --git a/core/classes/classes.factor b/core/classes/classes.factor
index 290269242c..8c65a5d10b 100644
--- a/core/classes/classes.factor
+++ b/core/classes/classes.factor
@@ -2,7 +2,6 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators definitions kernel
 make namespaces quotations sequences sets words words.symbol ;
-FROM: namespaces => set ;
 IN: classes
 
 ERROR: bad-inheritance class superclass ;
diff --git a/core/compiler/units/units.factor b/core/compiler/units/units.factor
index 002eac7e03..1dd6726c20 100644
--- a/core/compiler/units/units.factor
+++ b/core/compiler/units/units.factor
@@ -4,7 +4,6 @@ USING: accessors arrays assocs classes classes.private
 classes.tuple classes.tuple.private continuations definitions
 generic hash-sets init kernel kernel.private math namespaces
 sequences sets source-files.errors vocabs words ;
-FROM: namespaces => set ;
 IN: compiler.units
 
 PRIMITIVE: modify-code-heap ( alist update-existing? reset-pics? -- )
diff --git a/core/destructors/destructors.factor b/core/destructors/destructors.factor
index 716f91cfa5..3e4eaeeec9 100755
--- a/core/destructors/destructors.factor
+++ b/core/destructors/destructors.factor
@@ -2,7 +2,6 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs continuations init kernel make
 namespaces sequences sets ;
-FROM: namespaces => set ;
 IN: destructors
 
 SYMBOL: disposables
diff --git a/core/generic/standard/standard-tests.factor b/core/generic/standard/standard-tests.factor
index 009db7a8d8..888ce933d8 100644
--- a/core/generic/standard/standard-tests.factor
+++ b/core/generic/standard/standard-tests.factor
@@ -5,7 +5,6 @@ generic.standard io.streams.string kernel make math
 math.constants math.functions namespaces parser quotations
 sequences specialized-vectors strings tools.test words ;
 QUALIFIED-WITH: alien.c-types c
-FROM: namespaces => set ;
 SPECIALIZED-VECTOR: c:double
 IN: generic.standard.tests
 
diff --git a/core/source-files/source-files.factor b/core/source-files/source-files.factor
index 37a03b2f8e..2575ea686f 100644
--- a/core/source-files/source-files.factor
+++ b/core/source-files/source-files.factor
@@ -4,7 +4,6 @@ USING: accessors arrays assocs checksums checksums.crc32
 compiler.units continuations definitions io.encodings.utf8
 io.files io.pathnames kernel namespaces sequences sets
 source-files.errors strings words ;
-FROM: namespaces => set ;
 IN: source-files
 
 SYMBOL: source-files
diff --git a/extra/compiler/cfg/gvn/avail/avail.factor b/extra/compiler/cfg/gvn/avail/avail.factor
index 2a4b0c2fc7..8d817829c5 100644
--- a/extra/compiler/cfg/gvn/avail/avail.factor
+++ b/extra/compiler/cfg/gvn/avail/avail.factor
@@ -9,7 +9,6 @@ compiler.cfg.gvn.graph
 compiler.cfg.predecessors
 compiler.cfg.renaming.functor
 compiler.cfg.rpo ;
-FROM: namespaces => set ;
 QUALIFIED: assocs
 IN: compiler.cfg.gvn.avail
 
diff --git a/extra/graphviz/graphviz-tests.factor b/extra/graphviz/graphviz-tests.factor
index 0d1b24d5d2..b7bc2c6467 100644
--- a/extra/graphviz/graphviz-tests.factor
+++ b/extra/graphviz/graphviz-tests.factor
@@ -6,7 +6,6 @@ io.directories.hierarchy io.files io.files.unique io.launcher
 io.pathnames kernel locals make math math.combinatorics
 math.parser memoize namespaces sequences sequences.extras sets
 splitting system tools.test ;
-FROM: namespaces => set ;
 IN: graphviz.tests
 
 ! XXX hack
diff --git a/extra/koszul/koszul.factor b/extra/koszul/koszul.factor
index d81abc77b4..e5995e10bc 100644
--- a/extra/koszul/koszul.factor
+++ b/extra/koszul/koszul.factor
@@ -4,7 +4,6 @@ USING: accessors arrays assocs combinators fry hashtables io
 kernel locals make math math.matrices math.matrices.elimination
 math.order math.parser math.vectors namespaces prettyprint
 sequences sets shuffle sorting splitting ;
-FROM: namespaces => set ;
 IN: koszul
 
 ! Utilities
diff --git a/extra/managed-server/chat/chat.factor b/extra/managed-server/chat/chat.factor
index 52849b306e..258886c1f5 100644
--- a/extra/managed-server/chat/chat.factor
+++ b/extra/managed-server/chat/chat.factor
@@ -4,7 +4,6 @@ USING: accessors assocs calendar calendar.format
 combinators.smart io io.crlf io.encodings.utf8 kernel locals
 managed-server namespaces sequences sorting splitting
 unicode.case ;
-FROM: namespaces => set ;
 IN: managed-server.chat
 
 TUPLE: chat-server < managed-server ;
diff --git a/extra/managed-server/managed-server.factor b/extra/managed-server/managed-server.factor
index 1c4027402f..b7a73c4832 100644
--- a/extra/managed-server/managed-server.factor
+++ b/extra/managed-server/managed-server.factor
@@ -5,7 +5,6 @@ io.encodings.binary io.servers io.sockets
 io.streams.duplex fry kernel locals math math.ranges multiline
 namespaces prettyprint random sequences sets splitting threads
 tools.continuations ;
-FROM: namespaces => set ;
 IN: managed-server
 
 TUPLE: managed-server < threaded-server clients ;
diff --git a/extra/project-euler/051/051.factor b/extra/project-euler/051/051.factor
index f36f369851..cebd4d67f9 100644
--- a/extra/project-euler/051/051.factor
+++ b/extra/project-euler/051/051.factor
@@ -29,7 +29,6 @@
 USING: assocs kernel math math.combinatorics math.functions
 math.parser math.primes namespaces project-euler.common
 sequences sets strings grouping math.ranges arrays fry math.order ;
-FROM: namespaces => set ;
 IN: project-euler.051
 <PRIVATE
 SYMBOL: family-count