From eb9615d0526ac53d8a090a198a6b5fb5b5b51532 Mon Sep 17 00:00:00 2001
From: jamesmckinna <31931406+jamesmckinna@users.noreply.github.com>
Date: Wed, 15 Jan 2025 01:30:41 +0000
Subject: [PATCH] cherry-picked by hand from #2542 (#2548)

---
 src/Data/List/Membership/Propositional.agda         |  4 ++--
 .../Membership/Propositional/Properties/Core.agda   | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Data/List/Membership/Propositional.agda b/src/Data/List/Membership/Propositional.agda
index 2f5edc2d7e..60c2a9aa71 100644
--- a/src/Data/List/Membership/Propositional.agda
+++ b/src/Data/List/Membership/Propositional.agda
@@ -10,7 +10,7 @@
 module Data.List.Membership.Propositional {a} {A : Set a} where
 
 open import Data.List.Relation.Unary.Any using (Any)
-open import Relation.Binary.PropositionalEquality.Core using (_≡_; _≢_; resp; subst)
+open import Relation.Binary.PropositionalEquality.Core using (_≡_; _≢_; resp)
 open import Relation.Binary.PropositionalEquality.Properties using (setoid)
 
 import Data.List.Membership.Setoid as SetoidMembership
@@ -26,7 +26,7 @@ open SetoidMembership (setoid A) public hiding (lose)
 infix 4 _≢∈_
 
 _≢∈_ : ∀ {x y : A} {xs} → x ∈ xs → y ∈ xs → Set _
-_≢∈_ x∈xs y∈xs = ∀ x≡y → subst (_∈ _) x≡y x∈xs ≢ y∈xs
+_≢∈_ x∈xs y∈xs = ∀ x≡y → resp (_∈ _) x≡y x∈xs ≢ y∈xs
 
 ------------------------------------------------------------------------
 -- Other operations
diff --git a/src/Data/List/Membership/Propositional/Properties/Core.agda b/src/Data/List/Membership/Propositional/Properties/Core.agda
index 65485abb0e..b849d04f3b 100644
--- a/src/Data/List/Membership/Propositional/Properties/Core.agda
+++ b/src/Data/List/Membership/Propositional/Properties/Core.agda
@@ -20,7 +20,7 @@ open import Function.Base using (flip; id; _∘_)
 open import Function.Bundles using (_↔_; mk↔ₛ′)
 open import Level using (Level)
 open import Relation.Binary.PropositionalEquality.Core
-  using (_≡_; refl; cong; resp)
+  using (_≡_; refl; trans; cong; resp)
 open import Relation.Unary using (Pred; _⊆_)
 
 private
@@ -42,7 +42,8 @@ private
 
 find-∈ : (x∈xs : x ∈ xs) → find x∈xs ≡ (x , x∈xs , refl)
 find-∈ (here refl)  = refl
-find-∈ (there x∈xs) rewrite find-∈ x∈xs = refl
+find-∈ (there x∈xs)
+  = cong (λ where (x , x∈xs , eq) → x , there x∈xs , eq) (find-∈ x∈xs)
 
 ------------------------------------------------------------------------
 -- Lemmas relating map and find.
@@ -59,7 +60,8 @@ module _ {P : Pred A p} where
              let x , x∈xs , px = find p in
              find (Any.map f p) ≡ (x , x∈xs , f px)
   find∘map (here  p) f = refl
-  find∘map (there p) f rewrite find∘map p f = refl
+  find∘map (there p) f
+    = cong (λ where (x , x∈xs , eq) → x , there x∈xs , eq) (find∘map p f)
 
 ------------------------------------------------------------------------
 -- Any can be expressed using _∈_
@@ -67,14 +69,15 @@ module _ {P : Pred A p} where
 module _ {P : Pred A p} where
 
   ∃∈-Any : (∃ λ x → x ∈ xs × P x) → Any P xs
-  ∃∈-Any (x , x∈xs , px) = lose {P = P} x∈xs px
+  ∃∈-Any (x , x∈xs , px) = lose x∈xs px
 
   ∃∈-Any∘find : (p : Any P xs) → ∃∈-Any (find p) ≡ p
   ∃∈-Any∘find p = map∘find p refl
 
   find∘∃∈-Any : (p : ∃ λ x → x ∈ xs × P x) → find (∃∈-Any p) ≡ p
   find∘∃∈-Any p@(x , x∈xs , px)
-    rewrite find∘map x∈xs (flip (resp P) px) | find-∈ x∈xs = refl
+    = trans (find∘map x∈xs (flip (resp P) px))
+            (cong (λ (x , x∈xs , eq) → x , x∈xs , resp P eq px) (find-∈ x∈xs))
 
   Any↔ : (∃ λ x → x ∈ xs × P x) ↔ Any P xs
   Any↔ = mk↔ₛ′ ∃∈-Any find ∃∈-Any∘find find∘∃∈-Any