Skip to content

Commit 4871f37

Browse files
jmougeotJacquesCarettejamesmckinna
authored
[Refactor] imports to use Relation.Nullary.Irrelevant (#2676)
* New file Irrelevant * Module Irrelevant description * add Irrelevant file in CHANGELOG * remove blank line * Update src/Relation/Nullary/Irrelevant.agda Co-authored-by: jamesmckinna <[email protected]> * Fix * Update CHANGELOG.md Co-authored-by: jamesmckinna <[email protected]> --------- Co-authored-by: Jacques Carette <[email protected]> Co-authored-by: jamesmckinna <[email protected]>
1 parent e00111c commit 4871f37

File tree

15 files changed

+54
-30
lines changed

15 files changed

+54
-30
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ Non-backwards compatible changes
2828
Minor improvements
2929
------------------
3030

31+
* Moved the concept `Irrelevant` of irrelevance (h-proposition) from `Relation.Nullary`
32+
to its own dedicated module `Relation.Nullary.Irrelevant`.
33+
3134
Deprecated modules
3235
------------------
3336

src/Data/List/Fresh/Membership/Setoid/Properties.agda

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ open import Data.Sum.Base as Sum using (_⊎_; inj₁; inj₂; fromInj₂)
2626
open import Function.Base using (id; _∘′_; _$_)
2727
open import Relation.Binary.Core using (Rel)
2828
open import Relation.Nullary.Negation.Core using (¬_)
29-
open import Relation.Nullary using (Irrelevant)
29+
open import Relation.Nullary.Irrelevant using (Irrelevant)
3030
open import Relation.Unary as Unary using (Pred)
3131
import Relation.Binary.Definitions as Binary using (_Respectsˡ_; Irrelevant)
3232
import Relation.Binary.PropositionalEquality.Core as ≡

src/Data/List/Relation/Binary/Pointwise.agda

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,24 @@ open import Data.List.Properties using (≡-dec; length-++)
1818
open import Data.List.Relation.Unary.All as All using (All; []; _∷_)
1919
open import Data.List.Relation.Unary.AllPairs using (AllPairs; []; _∷_)
2020
open import Data.List.Relation.Unary.Any using (Any; here; there)
21-
open import Data.Fin.Base using (Fin; toℕ; cast) renaming (zero to fzero; suc to fsuc)
21+
open import Data.Fin.Base
22+
using (Fin; toℕ; cast)
23+
renaming (zero to fzero; suc to fsuc)
2224
open import Data.Nat.Base using (ℕ; zero; suc)
2325
open import Data.Nat.Properties
24-
open import Level
25-
open import Relation.Nullary hiding (Irrelevant)
26-
import Relation.Nullary.Decidable as Dec using (map′)
27-
open import Relation.Unary as U using (Pred)
26+
open import Level using (Level; _⊔_)
2827
open import Relation.Binary.Core renaming (Rel to Rel₂)
29-
open import Relation.Binary.Definitions using (Reflexive; _Respects_; _Respects₂_)
28+
open import Relation.Binary.Definitions
29+
using (Reflexive; _Respects_; _Respects₂_)
3030
open import Relation.Binary.Bundles using (Setoid; DecSetoid; Preorder; Poset)
31-
open import Relation.Binary.Structures using (IsEquivalence; IsDecEquivalence; IsPartialOrder; IsPreorder)
31+
open import Relation.Binary.Structures
32+
using (IsEquivalence; IsDecEquivalence; IsPartialOrder; IsPreorder)
3233
open import Relation.Binary.PropositionalEquality.Core as ≡ using (_≡_)
3334
import Relation.Binary.PropositionalEquality.Properties as ≡
35+
open import Relation.Nullary.Decidable as Dec
36+
using (map′; yes; no; Dec; _because_)
37+
open import Relation.Nullary.Negation.Core using (¬_; contradiction)
38+
open import Relation.Unary as U using (Pred)
3439

3540
private
3641
variable

src/Data/List/Relation/Unary/All.agda

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ open import Effect.Applicative
1919
open import Effect.Monad
2020
open import Function.Base using (_∘_; _∘′_; id; const)
2121
open import Level using (Level; _⊔_)
22-
open import Relation.Nullary hiding (Irrelevant)
23-
import Relation.Nullary.Decidable as Dec
22+
open import Relation.Nullary.Decidable.Core as Dec
23+
using (_×-dec_; yes; no; map′)
2424
open import Relation.Unary hiding (_∈_)
2525
import Relation.Unary.Properties as Unary
2626
open import Relation.Binary.Bundles using (Setoid)

src/Data/Maybe/Relation/Unary/Any.agda

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ open import Level using (Level; _⊔_)
1616
open import Relation.Binary.PropositionalEquality.Core using (_≡_; cong)
1717
open import Relation.Unary
1818
using (Pred; _⊆_; _∩_; Decidable; Irrelevant; Satisfiable)
19-
open import Relation.Nullary hiding (Irrelevant)
20-
import Relation.Nullary.Decidable as Dec using (Dec; yes; no; map)
19+
open import Relation.Nullary.Decidable as Dec using (Dec; yes; no)
2120

2221
------------------------------------------------------------------------
2322
-- Definition

src/Data/Nat/Properties.agda

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ open import Relation.Binary.Core
4444
open import Relation.Binary
4545
open import Relation.Binary.Consequences using (flip-Connex; wlog)
4646
open import Relation.Binary.PropositionalEquality
47-
open import Relation.Nullary hiding (Irrelevant)
4847
open import Relation.Nullary.Decidable
49-
using (True; via-injection; map′; recompute)
48+
using (True; via-injection; map′; recompute; no; yes; Dec; _because_)
5049
open import Relation.Nullary.Negation.Core using (¬_; contradiction)
51-
open import Relation.Nullary.Reflects using (fromEquivalence)
50+
open import Relation.Nullary.Reflects
51+
using (fromEquivalence; Reflects; invert)
5252

5353
open import Algebra.Definitions {A = ℕ} _≡_
5454
hiding (LeftCancellative; RightCancellative; Cancellative)

src/Data/Unit/Properties.agda

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ module Data.Unit.Properties where
1111
open import Data.Sum.Base using (inj₁)
1212
open import Data.Unit.Base using (⊤)
1313
open import Level using (0ℓ)
14-
open import Relation.Nullary using (Irrelevant; yes)
1514
open import Relation.Binary.Bundles
1615
using (Setoid; DecSetoid; Poset; DecTotalOrder)
1716
open import Relation.Binary.Structures
@@ -22,6 +21,9 @@ open import Relation.Binary.PropositionalEquality.Core
2221
using (_≡_; refl; trans)
2322
open import Relation.Binary.PropositionalEquality.Properties
2423
using (setoid; decSetoid; isEquivalence)
24+
open import Relation.Nullary.Decidable.Core using (yes)
25+
open import Relation.Nullary.Irrelevant using (Irrelevant)
26+
2527

2628
------------------------------------------------------------------------
2729
-- Irrelevancy

src/Data/Vec/Relation/Binary/Lex/NonStrict.agda

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ open import Relation.Binary.Definitions
3333
using (Irreflexive; _Respects₂_; Antisymmetric; Asymmetric; Symmetric; Trans
3434
; Decidable; Total; Trichotomous)
3535
import Relation.Binary.Construct.NonStrictToStrict as Conv
36-
open import Relation.Nullary hiding (Irrelevant)
36+
open import Relation.Nullary.Decidable.Core using (yes; no)
3737

3838
private
3939
variable

src/Relation/Binary/Construct/Add/Infimum/NonStrict.agda

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ open import Relation.Binary.Structures
2828
; IsDecTotalOrder)
2929
open import Relation.Binary.Definitions
3030
using (Minimum; Transitive; Total; Decidable; Irrelevant; Antisymmetric)
31-
open import Relation.Nullary hiding (Irrelevant)
3231
open import Relation.Nullary.Construct.Add.Infimum using (⊥₋; [_]; _₋; ≡-dec)
32+
open import Relation.Nullary.Decidable.Core using (yes; no; map′)
3333
import Relation.Nullary.Decidable.Core as Dec using (map′)
3434

3535
------------------------------------------------------------------------

src/Relation/Binary/Construct/Add/Infimum/Strict.agda

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ open import Relation.Binary.Structures
3030
open import Relation.Binary.Definitions
3131
using (Asymmetric; Transitive; Decidable; Irrelevant; Irreflexive; Trans
3232
; Trichotomous; tri≈; tri<; tri>; _Respectsˡ_; _Respectsʳ_; _Respects₂_)
33-
open import Relation.Nullary hiding (Irrelevant)
3433
open import Relation.Nullary.Construct.Add.Infimum
3534
using (⊥₋; [_]; _₋; ≡-dec; []-injective)
36-
import Relation.Nullary.Decidable.Core as Dec using (map′)
35+
open import Relation.Nullary.Decidable.Core as Dec using (yes; no; map′)
3736

3837
------------------------------------------------------------------------
3938
-- Definition

0 commit comments

Comments
 (0)