Use safer optional values, and other enabling changes

propensive · Jan 24, 2025 · f69ce54 · f69ce54
1 parent 4d9e8c8
commit f69ce54
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/core/wisteria.ContextRequirement.scala b/src/core/wisteria.ContextRequirement.scala
@@ -25,7 +25,7 @@ object ContextRequirement:
   given required: ContextRequirement:
     type Optionality[Type] = Type
     type Required = true
-    def wrap[ValueType](optional: Optional[ValueType]): ValueType = optional.vouch(using Unsafe)
+    def wrap[ValueType](optional: Optional[ValueType]): ValueType = optional.vouch
 
   object relaxed extends ContextRequirement:
     type Optionality[Type] = Optional[Type]

diff --git a/src/core/wisteria.ProductDerivationMethods.scala b/src/core/wisteria.ProductDerivationMethods.scala
@@ -121,7 +121,7 @@ trait ProductDerivationMethods[TypeclassType[_]]:
       accumulator => [FieldType2] => field =>
         if index == fieldIndex then field.asInstanceOf[FieldType] else accumulator
 
-    . vouch(using Unsafe)
+    . vouch
 
   protected transparent inline def fields[DerivationType <: Product](inline product: DerivationType)
      (using requirement: ContextRequirement)

diff --git a/src/core/wisteria.SumDerivationMethods.scala b/src/core/wisteria.SumDerivationMethods.scala
@@ -110,7 +110,7 @@ trait SumDerivationMethods[TypeclassType[_]]:
     fold[DerivationType, Variants, Labels](variantLabel, size, 0, true)(label == variantLabel):
       [VariantType <: DerivationType] => context => lambda[VariantType](context)
 
-    . vouch(using Unsafe)
+    . vouch
 
   protected transparent inline def variant[DerivationType](sum: DerivationType)
      (using reflection: SumReflection[DerivationType], requirement: ContextRequirement)
@@ -131,7 +131,7 @@ trait SumDerivationMethods[TypeclassType[_]]:
     fold[DerivationType, Variants, Labels](sum, size, 0, false)(index == reflection.ordinal(sum)):
       [VariantType <: DerivationType] => variant => lambda[VariantType](variant)
 
-    . vouch(using Unsafe)
+    . vouch
 
   private transparent inline def fold[DerivationType, VariantsType <: Tuple, LabelsType <: Tuple]
      (inline inputLabel: Text, size: Int, index: Int, fallible: Boolean)