Improved the convention for using text formatters.

5 files changed, 10 insertions, 12 deletions

diff --git a/stdlib/source/spec/compositor/generation/case.lux b/stdlib/source/spec/compositor/generation/case.lux
index 880a26eae..5b1187210 100644
--- a/stdlib/source/spec/compositor/generation/case.lux
+++ b/stdlib/source/spec/compositor/generation/case.lux
@@ -8,7 +8,7 @@
    [data
     ["." error (#+ Error)]
     ["." text ("#@." equivalence)
-     format]
+     ["%" format (#+ format)]]
     [collection
      ["." list ("#@." fold)]]]
    [math
@@ -97,7 +97,7 @@
   (-> Runner Test)
   (do r.monad
     [value r.safe-frac]
-    (_.test (%name (name-of synthesis.branch/let))
+    (_.test (%.name (name-of synthesis.branch/let))
             (|> (synthesis.branch/let [(synthesis.f64 value)
                                        0
                                        (synthesis.variable/local 0)])
@@ -110,7 +110,7 @@
     [on-true r.safe-frac
      on-false (|> r.safe-frac (r.filter (|>> (f/= on-true) not)))
      verdict r.bit]
-    (_.test (%name (name-of synthesis.branch/if))
+    (_.test (%.name (name-of synthesis.branch/if))
             (|> (synthesis.branch/if [(synthesis.bit verdict)
                                       (synthesis.f64 on-true)
                                       (synthesis.f64 on-false)])
@@ -123,7 +123,7 @@
     [[inputS pathS] ..case
      on-success r.safe-frac
      on-failure (|> r.safe-frac (r.filter (|>> (f/= on-success) not)))]
-    (_.test (%name (name-of synthesis.branch/case))
+    (_.test (%.name (name-of synthesis.branch/case))
             (|> (synthesis.branch/case
                  [inputS
                   ($_ synthesis.path/alt
diff --git a/stdlib/source/spec/compositor/generation/common.lux b/stdlib/source/spec/compositor/generation/common.lux
index c837c30a3..a4037c9d4 100644
--- a/stdlib/source/spec/compositor/generation/common.lux
+++ b/stdlib/source/spec/compositor/generation/common.lux
@@ -11,7 +11,7 @@
     [number
      ["." i64]]
     ["." text ("#@." equivalence)
-     format]
+     ["%" format (#+ format)]]
     [collection
      ["." list]]]
    [math
diff --git a/stdlib/source/spec/compositor/generation/function.lux b/stdlib/source/spec/compositor/generation/function.lux
index 2a8b4687d..0f12906a0 100644
--- a/stdlib/source/spec/compositor/generation/function.lux
+++ b/stdlib/source/spec/compositor/generation/function.lux
@@ -8,8 +8,6 @@
    [data
     ["." maybe]
     ["." error (#+ Error)]
-    [text
-     format]
     [collection
      ["." list ("#@." functor)]]]
    [math
diff --git a/stdlib/source/spec/compositor/generation/primitive.lux b/stdlib/source/spec/compositor/generation/primitive.lux
index 63568fbce..48ff99933 100644
--- a/stdlib/source/spec/compositor/generation/primitive.lux
+++ b/stdlib/source/spec/compositor/generation/primitive.lux
@@ -11,7 +11,7 @@
     [number
      ["." frac]]
     ["." text ("#@." equivalence)
-     format]]
+     ["%" format (#+ format)]]]
    [math
     ["r" random]]
    [tool
@@ -32,7 +32,7 @@
           (~~ (template [<evaluation-name> <synthesis> <gen> <test>]
                 [(do r.monad
                    [expected <gen>]
-                   (_.test (%name (name-of <synthesis>))
+                   (_.test (%.name (name-of <synthesis>))
                            (|> (run <evaluation-name> (<synthesis> expected))
                                (case> (#error.Success actual)
                                       (<test> expected (:assume actual))
diff --git a/stdlib/source/spec/compositor/generation/structure.lux b/stdlib/source/spec/compositor/generation/structure.lux
index 99745a819..d22775a43 100644
--- a/stdlib/source/spec/compositor/generation/structure.lux
+++ b/stdlib/source/spec/compositor/generation/structure.lux
@@ -9,7 +9,7 @@
     ["." error]
     ["." maybe]
     ["." text ("#@." equivalence)
-     format]
+     ["%" format (#+ format)]]
     [collection
      ["." array (#+ Array)]
      ["." list ("#@." functor)]]]
@@ -32,7 +32,7 @@
      tag-in (|> r.nat (:: @ map (n/% num-tags)))
      #let [last?-in (|> num-tags dec (n/= tag-in))]
      value-in r.i64]
-    (_.test (%name (name-of synthesis.variant))
+    (_.test (%.name (name-of synthesis.variant))
             (|> (synthesis.variant {#analysis.lefts (if last?-in
                                                       (dec tag-in)
                                                       tag-in)
@@ -65,7 +65,7 @@
   (do r.monad
     [size (|> r.nat (:: @ map (|>> (n/% 10) (n/max 2))))
      tuple-in (r.list size r.i64)]
-    (_.test (%name (name-of synthesis.tuple))
+    (_.test (%.name (name-of synthesis.tuple))
             (|> (synthesis.tuple (list@map (|>> synthesis.i64) tuple-in))
                 (run "tuple")
                 (case> (#error.Success tuple-out)