Rename elem to witness in Slots

briskml · Jan 17, 2019 · c80f053 · c80f053
1 parent 77bbe63
commit c80f053
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 27 deletions.
diff --git a/core/lib/Hooks.re b/core/lib/Hooks.re
@@ -53,7 +53,7 @@ module State = {
     let (stateContainer, nextSlots) =
       Slots.use(
         ~default=() => make(initialState),
-        ~toElem=wrapAsHook,
+        ~toWitness=wrapAsHook,
         hooks.slots,
       );
 
@@ -103,7 +103,7 @@ module Reducer = {
     let (stateContainer, nextSlots) =
       Slots.use(
         ~default=() => make(initialState),
-        ~toElem=wrapAsHook,
+        ~toWitness=wrapAsHook,
         hooks.slots,
       );
 
@@ -126,7 +126,7 @@ module Ref = {
     let (internalRef, nextSlots) =
       Slots.use(
         ~default=() => ref(initialState),
-        ~toElem=wrapAsHook,
+        ~toWitness=wrapAsHook,
         hooks.slots,
       );
 
@@ -222,7 +222,7 @@ module Effect = {
             cleanupHandler: None,
             previousCondition: condition,
           },
-        ~toElem=wrapAsHook,
+        ~toWitness=wrapAsHook,
         hooks.slots,
       );
 

diff --git a/core/lib/Hooks.rei b/core/lib/Hooks.rei
@@ -1,6 +1,6 @@
 type hook('a) = ..;
 
-module Slots: Slots.S with type elem('a) = hook('a);
+module Slots: Slots.S with type witness('a) = hook('a);
 
 type t('a, 'b) = {
   slots: Slots.t('a, 'b),

diff --git a/core/lib/Slots.re b/core/lib/Slots.re
@@ -1,34 +1,34 @@
-module type Elem = {type t('a);};
+module type Witness = {type t('a);};
 
 module type S = {
-  type elem('a);
-  type opaqueElement =
-    | Any(elem('a)): opaqueElement;
+  type witness('a);
+  type opaqueValue =
+    | Any(witness('a)): opaqueValue;
   type t('slot, 'nextSlots);
   type empty = t(unit, unit);
 
   let create: unit => t('slot, 'nextSlots);
   let use:
     (
       ~default: unit => 'slot,
-      ~toElem: 'slot => elem('slot),
+      ~toWitness: 'slot => witness('slot),
       t('slot, t('slot2, 'nextSlots))
     ) =>
     ('slot, t('slot2, 'nextSlots));
 
   let fold:
-    ((opaqueElement, 'acc) => 'acc, 'acc, t('slots, 'nextSlots)) => 'acc;
+    ((opaqueValue, 'acc) => 'acc, 'acc, t('slots, 'nextSlots)) => 'acc;
 };
 
-module Make = (Elem: Elem) => {
-  type elem('a) = Elem.t('a);
+module Make = (Witness: Witness) => {
+  type witness('a) = Witness.t('a);
 
-  type opaqueElement =
-    | Any(Elem.t('a)): opaqueElement;
+  type opaqueValue =
+    | Any(Witness.t('a)): opaqueValue;
 
   type slotInternal('slot, 'nextSlots) = {
     value: 'slot,
-    fold: 'acc. ((opaqueElement, 'acc) => 'acc, 'acc) => 'acc,
+    fold: 'acc. ((opaqueValue, 'acc) => 'acc, 'acc) => 'acc,
     next: 'nextSlots,
   };
 
@@ -41,11 +41,11 @@ module Make = (Elem: Elem) => {
   let use:
     (
       ~default: unit => 'slot,
-      ~toElem: 'slot => elem('slot),
+      ~toWitness: 'slot => witness('slot),
       t('slot, t('slot2, 'nextSlots))
     ) =>
     ('slot, t('slot2, 'nextSlots)) =
-    (~default, ~toElem, slots) =>
+    (~default, ~toWitness, slots) =>
       switch (slots^) {
       | None =>
         let nextSlots = create();
@@ -55,7 +55,7 @@ module Make = (Elem: Elem) => {
             value,
             next: nextSlots,
             fold: (f, initialValue) => {
-              let acc = f(Any(toElem(value)), initialValue);
+              let acc = f(Any(toWitness(value)), initialValue);
               switch (nextSlots^) {
               | Some({fold}) => fold(f, acc)
               | None => acc

diff --git a/core/lib/Slots.rei b/core/lib/Slots.rei
@@ -1,25 +1,25 @@
-module type Elem = {type t('a);};
+module type Witness = {type t('a);};
 
 module type S = {
-  type elem('a);
-  type opaqueElement =
-    | Any(elem('a)): opaqueElement;
+  type witness('a);
+  type opaqueValue =
+    | Any(witness('a)): opaqueValue;
   type t('slot, 'nextSlots);
   type empty = t(unit, unit);
 
   let create: unit => t('slot, 'nextSlots);
   let use:
     (
       ~default: unit => 'slot,
-      ~toElem: 'slot => elem('slot),
+      ~toWitness: 'slot => witness('slot),
       t('slot, t('slot2, 'nextSlots))
     ) =>
     ('slot, t('slot2, 'nextSlots));
 
   let fold:
-    ((opaqueElement, 'acc) => 'acc, 'acc, t('slots, 'nextSlots)) => 'acc;
+    ((opaqueValue, 'acc) => 'acc, 'acc, t('slots, 'nextSlots)) => 'acc;
 };
 
-module Make: (Elem: Elem) => S with type elem('a) = Elem.t('a);
+module Make: (Witness: Witness) => S with type witness('a) = Witness.t('a);
 
-include S with type elem('a) = 'a;
+include S with type witness('a) = 'a;