Skip to content

Commit 6ac1e0c

Browse files
Saransh-cppMatthewDaggitt
authored andcommitted
Simplify Data.Sum and leftover Data.List imports (#2011)
1 parent e42bf61 commit 6ac1e0c

File tree

29 files changed

+26
-31
lines changed

29 files changed

+26
-31
lines changed

README/Case.agda

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ module README.Case where
1212
open import Data.Fin hiding (pred)
1313
open import Data.Maybe hiding (from-just)
1414
open import Data.Nat hiding (pred)
15-
open import Data.List
16-
open import Data.Sum
1715
open import Data.Product
1816
open import Function.Base using (case_of_; case_return_of_)
1917
open import Relation.Nullary

README/Data/Container/FreeMonad.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ open import Data.Empty
1515
open import Data.Unit
1616
open import Data.Bool.Base using (Bool; true)
1717
open import Data.Nat
18-
open import Data.Sum using (inj₁; inj₂)
18+
open import Data.Sum.Base using (inj₁; inj₂)
1919
open import Data.Product.Base renaming (_×_ to _⟨×⟩_)
2020
open import Data.Container using (Container; _▷_)
2121
open import Data.Container.Combinator

README/Design/Decidability.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
module README.Design.Decidability where
1010

1111
open import Data.Bool
12-
open import Data.List
12+
open import Data.List.Base using (List; []; _∷_)
1313
open import Data.List.Properties using (∷-injective)
1414
open import Data.Nat
1515
open import Data.Nat.Properties using (suc-injective)

README/Design/Hierarchies.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
module README.Design.Hierarchies where
1010

11-
open import Data.Sum using (_⊎_)
11+
open import Data.Sum.Base using (_⊎_)
1212
open import Level using (Level; _⊔_; suc)
1313
open import Relation.Binary.Core using (_Preserves₂_⟶_⟶_)
1414

README/Nary.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ open import Data.Fin using (Fin; fromℕ; #_; inject₁)
1616
open import Data.List
1717
open import Data.List.Properties
1818
open import Data.Product using (_×_; _,_)
19-
open import Data.Sum using (inj₁; inj₂)
19+
open import Data.Sum.Base using (inj₁; inj₂)
2020
open import Function
2121
open import Relation.Nullary
2222
open import Relation.Binary using (module Tri); open Tri

src/Algebra/Construct/Flip/Op.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module Algebra.Construct.Flip.Op where
1111

1212
open import Algebra
1313
import Data.Product.Base as Prod
14-
import Data.Sum as Sum
14+
import Data.Sum.Base as Sum
1515
open import Function.Base using (flip)
1616
open import Level using (Level)
1717
open import Relation.Binary.Core using (Rel; _Preserves₂_⟶_⟶_)

src/Algebra/Construct/NaturalChoice/Min.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
open import Algebra.Core
1010
open import Algebra.Bundles
1111
open import Algebra.Construct.NaturalChoice.Base
12-
open import Data.Sum using (inj₁; inj₂; [_,_])
12+
open import Data.Sum.Base using (inj₁; inj₂; [_,_])
1313
open import Data.Product.Base using (_,_)
1414
open import Function.Base using (id)
1515
open import Relation.Binary

src/Algebra/Construct/Subst/Equality.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module Algebra.Construct.Subst.Equality
1919

2020
open import Algebra.Definitions
2121
open import Algebra.Structures
22-
import Data.Sum as Sum
22+
import Data.Sum.Base as Sum
2323
open import Function.Base
2424
open import Relation.Binary.Construct.Subst.Equality equiv
2525

src/Algebra/Lattice/Construct/Subst/Equality.agda

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
open import Algebra.Core using (Op₂)
1313
open import Algebra.Definitions
1414
open import Algebra.Lattice.Structures
15-
import Data.Sum as Sum
1615
open import Data.Product as Prod
1716
open import Function.Base
1817
open import Relation.Binary.Core

src/Algebra/Module/Definitions/Left.agda

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ module Algebra.Module.Definitions.Left
1515
{a b ℓb} (A : Set a) {B : Set b} (_≈_ : Rel B ℓb)
1616
where
1717

18-
open import Data.Sum
1918
open import Data.Product
2019

2120
------------------------------------------------------------------------

src/Algebra/Module/Definitions/Right.agda

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ module Algebra.Module.Definitions.Right
1616
where
1717

1818
open import Data.Product
19-
open import Data.Sum
2019

2120
------------------------------------------------------------------------
2221
-- Binary operations

src/Data/Container/Indexed/Combinator.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ open import Data.Container.Indexed
1313
open import Data.Empty.Polymorphic using (⊥; ⊥-elim)
1414
open import Data.Unit.Polymorphic.Base using (⊤)
1515
open import Data.Product as Prod hiding (Σ) renaming (_×_ to _⟨×⟩_)
16-
open import Data.Sum renaming (_⊎_ to _⟨⊎⟩_)
16+
open import Data.Sum.Base renaming (_⊎_ to _⟨⊎⟩_)
1717
open import Data.Sum.Relation.Unary.All as All using (All)
1818
open import Function.Base as F hiding (id; const) renaming (_∘_ to _⟨∘⟩_)
1919
open import Function.Inverse using (_↔̇_; inverse)

src/Data/List/Relation/Unary/Enumerates/Setoid.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
{-# OPTIONS --cubical-compatible --safe #-}
88

9-
open import Data.List
9+
open import Data.List.Base using (List)
1010
open import Level
1111
open import Relation.Binary
1212

src/Data/List/Relation/Unary/Enumerates/Setoid/Properties.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ open import Data.List.Membership.Setoid.Properties as Membership
1111
open import Data.List.Relation.Unary.Any using (index)
1212
open import Data.List.Relation.Unary.Any.Properties using (lookup-index)
1313
open import Data.List.Relation.Unary.Enumerates.Setoid
14-
open import Data.Sum using (inj₁; inj₂)
14+
open import Data.Sum.Base using (inj₁; inj₂)
1515
open import Data.Sum.Relation.Binary.Pointwise
1616
using (_⊎ₛ_; inj₁; inj₂)
1717
open import Data.Product using (_,_; proj₁; proj₂)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ open import Data.List.Base as List using (List; []; _∷_)
1616
open import Data.List.Relation.Unary.All as All using (All; []; _∷_)
1717
open import Data.List.Relation.Unary.Any as Any using (Any; here; there)
1818
open import Data.Product as Prod using (∃; -,_; _,_)
19-
open import Data.Sum as Sum using (_⊎_; inj₁; inj₂)
19+
open import Data.Sum.Base as Sum using (_⊎_; inj₁; inj₂)
2020
open import Function
2121
open import Relation.Unary
2222
open import Relation.Nullary

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module Data.List.Relation.Unary.Grouped where
1010

1111
open import Data.List.Base using (List; []; _∷_; map)
1212
open import Data.List.Relation.Unary.All as All using (All; []; _∷_; all?)
13-
open import Data.Sum using (_⊎_; inj₁; inj₂)
13+
open import Data.Sum.Base using (_⊎_; inj₁; inj₂)
1414
open import Data.Product using (_×_; _,_)
1515
open import Relation.Binary as B using (REL; Rel)
1616
open import Relation.Unary as U using (Pred)

src/Data/List/Relation/Unary/Grouped/Properties.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
module Data.List.Relation.Unary.Grouped.Properties where
1010

1111
open import Data.Bool using (true; false)
12-
open import Data.List
12+
open import Data.List.Base using ([]; [_]; _∷_; map; derun)
1313
open import Data.List.Relation.Unary.All as All using (All; []; _∷_)
1414
import Data.List.Relation.Unary.All.Properties as All
1515
open import Data.List.Relation.Unary.AllPairs as AllPairs using (AllPairs; []; _∷_)

src/Data/List/Relation/Unary/Unique/DecSetoid/Properties.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
{-# OPTIONS --cubical-compatible --safe #-}
88

9-
open import Data.List
9+
open import Data.List.Base using ([]; _∷_; deduplicate)
1010
import Data.List.Relation.Unary.Unique.DecSetoid as Unique
1111
open import Data.List.Relation.Unary.All.Properties using (all-filter)
1212
open import Data.List.Relation.Unary.Unique.Setoid.Properties

src/Data/Nat/Binary/Subtraction.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ open import Data.Nat.Binary.Base
1717
open import Data.Nat.Binary.Properties
1818
import Data.Nat.Properties as ℕₚ
1919
open import Data.Product using (_×_; _,_; proj₁; proj₂; ∃)
20-
open import Data.Sum using (inj₁; inj₂)
20+
open import Data.Sum.Base using (inj₁; inj₂)
2121
open import Data.Vec using ([]; _∷_)
2222
open import Function.Base using (_∘_; _$_)
2323
open import Level using (0ℓ)

src/Data/Nat/Combinatorics/Specification.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ open import Data.Nat.DivMod
1616
open import Data.Nat.Divisibility
1717
open import Data.Nat.Properties
1818
open import Data.Nat.Combinatorics.Base
19-
open import Data.Sum using (inj₁; inj₂)
19+
open import Data.Sum.Base using (inj₁; inj₂)
2020
open import Relation.Binary.PropositionalEquality
2121
using (_≡_; trans; _≢_)
2222
open import Relation.Nullary.Decidable using (yes; no; does)

src/Data/Nat/InfinitelyOften.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ open import Data.Empty using (⊥-elim)
1414
open import Data.Nat.Base
1515
open import Data.Nat.Properties
1616
open import Data.Product as Prod hiding (map)
17-
open import Data.Sum hiding (map)
17+
open import Data.Sum.Base using (inj₁; inj₂; _⊎_)
1818
open import Function
1919
open import Relation.Binary.PropositionalEquality
2020
open import Relation.Nullary.Negation using (¬_)

src/Data/Tree/AVL/Indexed/Relation/Unary/Any/Properties.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ open import Data.Maybe.Properties using (just-injective)
1717
open import Data.Maybe.Relation.Unary.All as Maybe using (nothing; just)
1818
open import Data.Nat.Base using (ℕ)
1919
open import Data.Product as Prod using (∃; ∃-syntax; _×_; _,_; proj₁; proj₂)
20-
open import Data.Sum as Sum using (_⊎_; inj₁; inj₂)
20+
open import Data.Sum.Base as Sum using (_⊎_; inj₁; inj₂)
2121
open import Function.Base as F
2222
open import Level using (Level)
2323

src/Data/Tree/AVL/Map/Membership/Propositional.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ open import Data.Bool.Base using (true; false)
1717
open import Data.Maybe.Base using (just; nothing; is-just)
1818
open import Data.Product as Prod using (_×_; ∃-syntax; _,_; proj₁; proj₂)
1919
open import Data.Product.Relation.Binary.Pointwise.NonDependent renaming (Pointwise to _×ᴿ_)
20-
open import Data.Sum using (_⊎_; inj₁; inj₂)
20+
open import Data.Sum.Base using (_⊎_; inj₁; inj₂)
2121
open import Function.Base using (_∘_; _∘′_)
2222
open import Level using (Level)
2323

src/Data/Tree/AVL/Map/Membership/Propositional/Properties.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ open import Data.Bool.Base using (true; false)
1717
open import Data.Maybe.Base using (just; nothing; is-just)
1818
open import Data.Product as Prod using (_×_; ∃-syntax; _,_; proj₁; proj₂)
1919
open import Data.Product.Relation.Binary.Pointwise.NonDependent renaming (Pointwise to _×ᴿ_)
20-
open import Data.Sum using (_⊎_; inj₁; inj₂)
20+
open import Data.Sum.Base using (_⊎_; inj₁; inj₂)
2121
open import Function.Base using (_∘_; _∘′_)
2222
open import Level using (Level)
2323

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ open import Data.Empty
1212
open import Data.Nat using (ℕ; suc)
1313
import Data.Nat.Properties as ℕ
1414
open import Data.Product using (_×_; _,_; proj₁; proj₂; uncurry)
15-
open import Data.Sum using (_⊎_; inj₁; inj₂; [_,_])
15+
open import Data.Sum.Base using (_⊎_; inj₁; inj₂; [_,_])
1616
open import Data.Vec using (Vec; []; _∷_)
1717
open import Data.Vec.Relation.Binary.Pointwise.Inductive using (Pointwise; []; _∷_)
1818
open import Function.Base using (flip)

src/Effect/Monad/Error/Transformer.agda

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ record RawMonadError
4141

4242
module Sumₗ where
4343

44-
open import Data.Sum using (inj₁; inj₂; [_,_]′)
44+
open import Data.Sum.Base using (inj₁; inj₂; [_,_]′)
4545
open import Data.Sum.Effectful.Left.Transformer E a
4646

4747
monadError : RawMonad M RawMonadError (SumₗT M)
@@ -54,7 +54,7 @@ module Sumₗ where
5454

5555
module Sumᵣ where
5656

57-
open import Data.Sum using (inj₁; inj₂; [_,_]′)
57+
open import Data.Sum.Base using (inj₁; inj₂; [_,_]′)
5858
open import Data.Sum.Effectful.Right.Transformer a E
5959

6060
monadError : RawMonad M RawMonadError (SumᵣT M)

src/Reflection/External.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ open import Data.Nat.Base using (ℕ; suc; zero; NonZero)
1414
open import Data.List.Base using (List; _∷_; [])
1515
open import Data.Product using (_×_; _,_)
1616
open import Data.String.Base as String using (String; _++_)
17-
open import Data.Sum using (_⊎_; inj₁; inj₂; [_,_])
17+
open import Data.Sum.Base using (_⊎_; inj₁; inj₂; [_,_])
1818
open import Data.Unit.Base using (⊤; tt)
1919
open import Function.Base using (case_of_; _$_; _∘_)
2020
open import Reflection hiding (name)

src/Relation/Nullary/Universe.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ open import Relation.Binary.PropositionalEquality.Core using (_≡_; refl)
1717
import Relation.Binary.PropositionalEquality.Properties as PropEq
1818
import Relation.Binary.Indexed.Heterogeneous.Construct.Trivial
1919
as Trivial
20-
open import Data.Sum as Sum hiding (map)
20+
open import Data.Sum.Base as Sum hiding (map)
2121
open import Data.Sum.Relation.Binary.Pointwise
2222
open import Data.Product as Prod hiding (map)
2323
open import Data.Product.Relation.Binary.Pointwise.NonDependent

src/Relation/Unary/Algebra.agda

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import Algebra.Lattice.Structures as AlgebraicLatticeStructures
1515
import Algebra.Structures as AlgebraicStructures
1616
open import Data.Empty.Polymorphic using (⊥-elim)
1717
open import Data.Product as Product using (_,_; proj₁; proj₂; <_,_>; curry; uncurry)
18-
open import Data.Sum as Sum using (inj₁; inj₂; [_,_])
18+
open import Data.Sum.Base as Sum using (inj₁; inj₂; [_,_])
1919
open import Data.Unit.Polymorphic using (tt)
2020
open import Function.Base using (id; const; _∘_)
2121
open import Level

0 commit comments

Comments
 (0)