From 6631c9bad78a4b0f34d0c5f3c4e8b05aeddacade Mon Sep 17 00:00:00 2001
From: Ozzie Gooen <ozzieagooen@gmail.com>
Date: Wed, 31 Aug 2022 19:56:12 -0700
Subject: [PATCH] Renamed getByWithFn

---
 packages/squiggle-lang/__tests__/E/A_test.res     | 10 +++++-----
 packages/squiggle-lang/src/rescript/Utility/E.res |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/squiggle-lang/__tests__/E/A_test.res b/packages/squiggle-lang/__tests__/E/A_test.res
index c40dba7f..81a38d36 100644
--- a/packages/squiggle-lang/__tests__/E/A_test.res
+++ b/packages/squiggle-lang/__tests__/E/A_test.res
@@ -1,21 +1,21 @@
 open Jest
 open TestHelpers
 
-describe("E.A.getByWithFn", () => {
-  makeTest("Empty list returns None", E.A.getByWithFn([], x => x + 1, x => mod(x, 2) == 0), None)
+describe("E.A.getByFmap", () => {
+  makeTest("Empty list returns None", E.A.getByFmap([], x => x + 1, x => mod(x, 2) == 0), None)
   makeTest(
     "Never predicate returns None",
-    E.A.getByWithFn([1, 2, 3, 4, 5, 6], x => x + 1, _ => false),
+    E.A.getByFmap([1, 2, 3, 4, 5, 6], x => x + 1, _ => false),
     None,
   )
   makeTest(
     "function evaluates",
-    E.A.getByWithFn([1, 1, 1, 1, 1, 1, 1, 2, 1, 1], x => 3 * x, x => x > 4),
+    E.A.getByFmap([1, 1, 1, 1, 1, 1, 1, 2, 1, 1], x => 3 * x, x => x > 4),
     Some(6),
   )
   makeTest(
     "always predicate returns fn(fst(a))",
-    E.A.getByWithFn([0, 1, 2, 3, 4, 5, 6], x => 10 + x, _ => true),
+    E.A.getByFmap([0, 1, 2, 3, 4, 5, 6], x => 10 + x, _ => true),
     Some(10),
   )
 })
diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res
index a2012efd..bceb12c7 100644
--- a/packages/squiggle-lang/src/rescript/Utility/E.res
+++ b/packages/squiggle-lang/src/rescript/Utility/E.res
@@ -572,7 +572,7 @@ module A = {
       |> (x => Ok(x))
     }
 
-  let getByWithFn = (a, fn, boolCondition) => {
+  let getByFmap = (a, fn, boolCondition) => {
     let i = ref(0)
     let finalFunctionValue = ref(None)
     let length = Belt.Array.length(a)
@@ -690,7 +690,7 @@ module A = {
     let firstSome = x => Belt.Array.getBy(x, O.isSome)
 
     let firstSomeFn = (r: array<unit => option<'a>>): option<'a> =>
-      O.flatten(getByWithFn(r, l => l(), O.isSome))
+      O.flatten(getByFmap(r, l => l(), O.isSome))
 
     let firstSomeFnWithDefault = (r, default) => firstSomeFn(r)->O2.default(default)