From 74e8954ee269aa5dea39f1e4e3c55e8d387384a8 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Fri, 21 Oct 2022 14:37:09 -0400
Subject: Clean-up after format change for extensions [part 2]

---
 stdlib/source/specification/compositor/analysis/type.lux | 6 +++---
 stdlib/source/specification/compositor/common.lux        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'stdlib/source/specification/compositor')

diff --git a/stdlib/source/specification/compositor/analysis/type.lux b/stdlib/source/specification/compositor/analysis/type.lux
index 3eab3d50d..726e438c9 100644
--- a/stdlib/source/specification/compositor/analysis/type.lux
+++ b/stdlib/source/specification/compositor/analysis/type.lux
@@ -12,7 +12,7 @@
    [meta
     ["[0]" code]
     [compiler
-     [analysis (.only State+)]
+     [analysis (.only State)]
      ["[0]" phase
       [macro (.only Expander)]
       ["[0]" analysis
@@ -22,7 +22,7 @@
     ["_" property (.only Test)]]]])
 
 (def (check_success+ expander state extension params output_type)
-  (-> Expander State+ Text (List Code) Type Bit)
+  (-> Expander State Text (List Code) Type Bit)
   (|> (analysis/scope.with_scope ""
         (analysis/type.with_type output_type
           (analysis.phase expander (` ((, (code.text extension)) (,* params))))))
@@ -53,7 +53,7 @@
                  )))))
 
 (def .public (spec expander state)
-  (-> Expander State+ Test)
+  (-> Expander State Test)
   (do r.monad
     [[typeC exprT exprC] ..check
      [other_typeC other_exprT other_exprC] ..check]
diff --git a/stdlib/source/specification/compositor/common.lux b/stdlib/source/specification/compositor/common.lux
index 2a3e6fb45..f72bb20bc 100644
--- a/stdlib/source/specification/compositor/common.lux
+++ b/stdlib/source/specification/compositor/common.lux
@@ -28,7 +28,7 @@
 (type .public (Instancer what)
   (All (_ anchor expression declaration)
     (-> (Platform IO anchor expression declaration)
-        (generation.State+ anchor expression declaration)
+        (generation.State anchor expression declaration)
         what)))
 
 (def (runner (open "[0]") state)
@@ -65,7 +65,7 @@
         (generation.Bundle anchor expression declaration)
         (declaration.Bundle anchor expression declaration)
         (-> expression declaration) Extender
-        (IO (Try [(declaration.State+ anchor expression declaration)
+        (IO (Try [(declaration.State anchor expression declaration)
                   Runner
                   Definer]))))
   (do io.monad
-- 
cgit v1.2.3