Skip to content

Commit 22bfd05

Browse files
authored
[DRY] Refactor Data.List.Relation.Binary.Equality.Setoid exports (#2490)
* refactor `Data.List.Relation.Binary.Equality.DecSetoid` * refactor `Data.List.Relation.Binary.Equality.Setoid` * oops! get import/export of `setoid` correctt * knock-on: tighten `impport`s
1 parent 7e94c15 commit 22bfd05

File tree

3 files changed

+22
-37
lines changed

3 files changed

+22
-37
lines changed

src/Data/List/Relation/Binary/Equality/DecSetoid.agda

+10-18
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,25 @@
77
{-# OPTIONS --cubical-compatible --safe #-}
88

99
open import Relation.Binary.Bundles using (DecSetoid)
10-
open import Relation.Binary.Structures using (IsDecEquivalence)
11-
open import Relation.Binary.Definitions using (Decidable)
1210

1311
module Data.List.Relation.Binary.Equality.DecSetoid
1412
{a ℓ} (DS : DecSetoid a ℓ) where
1513

1614
import Data.List.Relation.Binary.Equality.Setoid as SetoidEquality
17-
import Data.List.Relation.Binary.Pointwise as PW
18-
open import Level
19-
open import Relation.Binary.Definitions using (Decidable)
20-
open DecSetoid DS
21-
22-
------------------------------------------------------------------------
23-
-- Make all definitions from setoid equality available
24-
25-
open SetoidEquality setoid public
15+
open import Data.List.Relation.Binary.Pointwise using (decSetoid)
16+
open DecSetoid DS using (setoid)
2617

2718
------------------------------------------------------------------------
2819
-- Additional properties
2920

30-
infix 4 _≋?_
21+
≋-decSetoid : DecSetoid _ _
22+
≋-decSetoid = decSetoid DS
3123

32-
_≋?_ : Decidable _≋_
33-
_≋?_ = PW.decidable _≟_
24+
open DecSetoid ≋-decSetoid public
25+
using ()
26+
renaming (isDecEquivalence to ≋-isDecEquivalence; _≟_ to _≋?_)
3427

35-
≋-isDecEquivalence : IsDecEquivalence _≋_
36-
≋-isDecEquivalence = PW.isDecEquivalence isDecEquivalence
28+
------------------------------------------------------------------------
29+
-- Make all definitions from setoid equality available
3730

38-
≋-decSetoid : DecSetoid a (a ⊔ ℓ)
39-
≋-decSetoid = PW.decSetoid DS
31+
open SetoidEquality setoid public

src/Data/List/Relation/Binary/Equality/Setoid.agda

+8-15
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,17 @@ open PW public
4848
-- Relational properties
4949
------------------------------------------------------------------------
5050

51-
≋-refl : Reflexive _≋_
52-
≋-refl = PW.refl refl
53-
54-
≋-reflexive : _≡_ ⇒ _≋_
55-
≋-reflexive ≡.refl = ≋-refl
56-
57-
≋-sym : Symmetric _≋_
58-
≋-sym = PW.symmetric sym
59-
60-
≋-trans : Transitive _≋_
61-
≋-trans = PW.transitive trans
62-
63-
≋-isEquivalence : IsEquivalence _≋_
64-
≋-isEquivalence = PW.isEquivalence isEquivalence
65-
6651
≋-setoid : Setoid _ _
6752
≋-setoid = PW.setoid S
6853

54+
open Setoid ≋-setoid public
55+
using ()
56+
renaming ( refl to ≋-refl
57+
; reflexive to ≋-reflexive
58+
; sym to ≋-sym
59+
; trans to ≋-trans
60+
; isEquivalence to ≋-isEquivalence)
61+
6962
------------------------------------------------------------------------
7063
-- Relationships to predicates
7164
------------------------------------------------------------------------

src/Data/List/Relation/Binary/Subset/DecSetoid.agda

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ open import Function.Base using (_∘_)
1414
open import Data.List.Base using ([]; _∷_)
1515
open import Data.List.Relation.Unary.Any using (here; there; map)
1616
open import Relation.Binary.Definitions using (Decidable)
17-
open import Relation.Nullary using (yes; no)
18-
open DecSetoid S
19-
open import Data.List.Relation.Binary.Equality.DecSetoid S
20-
open import Data.List.Membership.DecSetoid S
17+
open import Relation.Nullary.Decidable.Core using (yes; no)
18+
19+
open DecSetoid S using (setoid; refl; trans)
20+
open import Data.List.Membership.DecSetoid S using (_∈?_)
2121

2222
-- Re-export definitions
2323
open import Data.List.Relation.Binary.Subset.Setoid setoid public

0 commit comments

Comments
 (0)