Test fix

core/optimizer/optimizer-tests.factor

@@ -1,8 +1,9 @@
 USING: arrays compiler.units generic hashtables inference kernel
 kernel.private math optimizer prettyprint sequences sbufs
 strings tools.test vectors words sequences.private quotations
-optimizer.backend classes inference.dataflow tuples.private
+optimizer.backend classes classes.algebra inference.dataflow
-continuations growable optimizer.inlining namespaces hints ;
+tuples.private continuations growable optimizer.inlining
+namespaces hints ;
 IN: optimizer.tests
 
 [ H{ { 1 5 } { 3 4 } { 2 5 } } ] [

extra/tools/deploy/shaker/shaker.factor

@@ -139,31 +139,29 @@ IN: tools.deploy.shaker
             { } { "cpu" } strip-vocab-globals %
 
             {
-                vocabs:dictionary
+                classes:class-and-cache
-                lexer-factory
+                classes:class-not-cache
-                vocabs:load-vocab-hook
+                classes:class-or-cache
-                root-cache
+                classes:class<-cache
+                classes:classes-intersect-cache
+                classes:update-map
+                compiled-crossref
+                compiler.units:recompile-hook
+                definitions:crossref
+                interactive-vocabs
                 layouts:num-tags
                 layouts:num-types
                 layouts:tag-mask
                 layouts:tag-numbers
                 layouts:type-numbers
-                classes:class<-cache
-                classes:class-not-cache
-                classes:classes-intersect-cache
-                classes:class-and-cache
-                classes:class-or-cache
-                classes:update-map
-                vocab-roots
-                definitions:crossref
-                compiled-crossref
-                interactive-vocabs
-                word
-                compiler.units:recompile-hook
-                listener:listener-hook
                 lexer-factory
-                classes:update-map
+                lexer-factory
-                classes:class<map
+                listener:listener-hook
+                root-cache
+                vocab-roots
+                vocabs:dictionary
+                vocabs:load-vocab-hook
+                word
             } %
         ] when