From e306d32c7466ec115267fddb89e57402fc16e393 Mon Sep 17 00:00:00 2001
From: Philip Monk <phil@pcmonk.me>
Date: Wed, 11 Jan 2023 15:12:11 -0700
Subject: [PATCH] Revert "Merge pull request #6039 from tadad/da/apt-in"

This reverts commit 31bb93846c3221812657552f5e0c6df89aa85de0, reversing
changes made to 7940dd442bcead725c422f87446a30a3f9e85ea7.

Reverting because we can't upgrade jetted code without ensuring the jets
change in lockstep.
---
 pkg/arvo/sys/hoon.hoon           |  8 ++++----
 pkg/arvo/tests/sys/hoon/set.hoon |  7 -------
 pkg/urbit/jets/d/in_apt.c        | 14 ++------------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon
index c165f6322..24c746d8a 100644
--- a/pkg/arvo/sys/hoon.hoon
+++ b/pkg/arvo/sys/hoon.hoon
@@ -1247,10 +1247,10 @@
     =|  [l=(unit) r=(unit)]
     |.  ^-  ?
     ?~  a   &
-    ?&  ?~(l & &((gor n.a u.l) !=(n.a u.l)))
-        ?~(r & &((gor u.r n.a) !=(u.r n.a)))
-        ?~(l.a & ?&((mor n.a n.l.a) !=(n.a n.l.a) $(a l.a, l `n.a)))
-        ?~(r.a & ?&((mor n.a n.r.a) !=(n.a n.r.a) $(a r.a, r `n.a)))
+    ?&  ?~(l & (gor n.a u.l))
+        ?~(r & (gor u.r n.a))
+        ?~(l.a & ?&((mor n.a n.l.a) $(a l.a, l `n.a)))
+        ?~(r.a & ?&((mor n.a n.r.a) $(a r.a, r `n.a)))
     ==
   ::
   ++  bif                                               ::  splits a by b
diff --git a/pkg/arvo/tests/sys/hoon/set.hoon b/pkg/arvo/tests/sys/hoon/set.hoon
index c39656998..77ce543d2 100644
--- a/pkg/arvo/tests/sys/hoon/set.hoon
+++ b/pkg/arvo/tests/sys/hoon/set.hoon
@@ -106,10 +106,6 @@
   ::  Doesn't follow horizontal & vertical ordering
   ::
   =/  unbalanced-e=(set @)  [1 [3 ~ ~] [2 ~ ~]]
-  ::  Duplicate elements
-  ::
-  =/  has-dupes=(set @)  [1 [1 ~ ~] ~]
-  ::
   ;:  weld
     %+  expect-eq
       !>  [%b-a %.y]
@@ -129,9 +125,6 @@
     %+  expect-eq
       !>  [%u-e %.n]
       !>  [%u-e ~(apt in unbalanced-e)]
-    %+  expect-eq
-      !>  [%h-d %.n]
-      !>  [%h-d ~(apt in has-dupes)]
   ==
 ::
 ::  Test splits a in b
diff --git a/pkg/urbit/jets/d/in_apt.c b/pkg/urbit/jets/d/in_apt.c
index a5fe0bd9f..c3276bc4a 100644
--- a/pkg/urbit/jets/d/in_apt.c
+++ b/pkg/urbit/jets/d/in_apt.c
@@ -13,21 +13,15 @@ _in_apt(u3_noun a, u3_weak l, u3_weak r)
     u3_noun n_a, l_a, r_a;
     u3x_trel(a, &n_a, &l_a, &r_a);
 
-    if ( (u3_none != l) &&
-         ( (c3y == u3r_sing(n_a, l)) || (c3n == u3qc_gor(n_a, l)) )) {
+    if ( (u3_none != l) && (c3n == u3qc_gor(n_a, l)) ) {
       return c3n;
     }
 
-    if ( (u3_none != r) &&
-         ( (c3y == u3r_sing(r, n_a)) || (c3n == u3qc_gor(r, n_a)) )) {
+    if ( (u3_none != r) && (c3n == u3qc_gor(r, n_a)) ) {
       return c3n;
     }
 
     if ( u3_nul != l_a ) {
-      if ( c3y == u3r_sing(n_a, u3h(l_a)) ) {
-        return c3n;
-      }
-
       if ( c3n == u3qc_mor(n_a, u3h(l_a)) ) {
         return c3n;
       }
@@ -38,10 +32,6 @@ _in_apt(u3_noun a, u3_weak l, u3_weak r)
     }
 
     if ( u3_nul != r_a ) {
-      if ( c3y == u3r_sing(n_a, u3h(r_a)) ) {
-        return c3n;
-      }
-
       if ( c3n == u3qc_mor(n_a, u3h(r_a)) ) {
         return c3n;
       }