Skip to content

Simplify Data.List imports #2007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README/Data/List/Relation/Binary/Pointwise.agda
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
module README.Data.List.Relation.Binary.Pointwise where

open import Data.Nat using (ℕ; _<_; s≤s; z≤n)
open import Data.List using (List; []; _∷_; length)
open import Data.List.Base using (List; []; _∷_; length)
open import Relation.Binary.PropositionalEquality
using (_≡_; refl; sym; cong; setoid)
open import Relation.Nullary.Negation using (¬_)
Expand Down
2 changes: 1 addition & 1 deletion README/Data/List/Relation/Binary/Subset.agda
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-- Documentation for subset relations over `List`s
------------------------------------------------------------------------

open import Data.List using (List; _∷_; [])
open import Data.List.Base using (List; _∷_; [])
open import Data.List.Membership.Propositional.Properties
using (∈-++⁺ˡ; ∈-insert)
open import Data.List.Relation.Binary.Subset.Propositional using (_⊆_)
Expand Down
2 changes: 1 addition & 1 deletion README/Data/Tree/AVL.agda
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ t₃ = delete 2 t₂

-- Conversion of a list of key-value mappings to a tree.

open import Data.List using (_∷_; [])
open import Data.List.Base using (_∷_; [])

t₄ : Tree
t₄ = fromList ((2 , v₂) ∷ (1 , v₁) ∷ [])
Expand Down
2 changes: 1 addition & 1 deletion README/Data/Trie/NonDependent.agda
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ open import Data.Unit
open import Data.Bool
open import Data.Char as Char
import Data.Char.Properties as Char
open import Data.List as List using (List; []; _∷_)
open import Data.List.Base as List using (List; []; _∷_)
open import Data.List.Fresh as List# using (List#; []; _∷#_)
open import Data.Maybe as Maybe
open import Data.Product as Prod
Expand Down
2 changes: 1 addition & 1 deletion README/Tactic/RingSolver.agda
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ instance
------------------------------------------------------------------------------
-- Imports!

open import Data.List as List using (List; _∷_; [])
open import Data.List.Base as List using (List; _∷_; [])
open import Function
open import Relation.Binary.PropositionalEquality
using (subst; cong; _≡_; module ≡-Reasoning)
Expand Down
2 changes: 1 addition & 1 deletion README/Text/Regex.agda
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
module README.Text.Regex where

open import Data.Bool using (true; false)
open import Data.List using (_∷_; [])
open import Data.List.Base using (_∷_; [])
open import Data.String
open import Function.Base using () renaming (_$′_ to _$_)
open import Relation.Nullary.Decidable using (yes)
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Fin/Permutation/Transposition/List.agda
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ open import Data.Fin.Base
open import Data.Fin.Patterns using (0F)
open import Data.Fin.Permutation as P hiding (lift₀)
import Data.Fin.Permutation.Components as PC
open import Data.List using (List; []; _∷_; map)
open import Data.List.Base using (List; []; _∷_; map)
open import Data.Nat.Base using (ℕ; suc; zero)
open import Data.Product using (_×_; _,_)
open import Function.Base using (_∘_)
Expand Down
2 changes: 1 addition & 1 deletion src/Data/List/Countdown.agda
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ open import Function.Base
open import Function.Bundles
using (Injection; module Injection)
open import Data.Bool.Base using (true; false)
open import Data.List hiding (lookup)
open import Data.List.Base hiding (lookup)
open import Data.List.Relation.Unary.Any as Any using (here; there)
open import Data.Nat.Base using (ℕ; zero; suc)
open import Data.Product
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ open import Data.Maybe.Base as M
open import Data.Nat.Base as Nat using (ℕ)
open import Data.Product
open import Data.Vec.Base as Vec using (Vec ; lookup)
open import Data.List hiding (lookup)
open import Data.List.Base hiding (lookup)
open import Data.List.Properties
open import Data.List.Relation.Binary.Sublist.Heterogeneous
hiding (lookup)
Expand Down
2 changes: 1 addition & 1 deletion src/Data/List/Relation/Unary/AllPairs/Properties.agda
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

module Data.List.Relation.Unary.AllPairs.Properties where

open import Data.List hiding (any)
open import Data.List.Base hiding (any)
open import Data.List.Relation.Unary.All as All using (All; []; _∷_)
import Data.List.Relation.Unary.All.Properties as All
open import Data.List.Relation.Unary.AllPairs as AllPairs using (AllPairs; []; _∷_)
Expand Down
2 changes: 1 addition & 1 deletion src/Data/List/Relation/Unary/Grouped.agda
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

module Data.List.Relation.Unary.Grouped where

open import Data.List using (List; []; _∷_; map)
open import Data.List.Base using (List; []; _∷_; map)
open import Data.List.Relation.Unary.All as All using (All; []; _∷_; all?)
open import Data.Sum using (_⊎_; inj₁; inj₂)
open import Data.Product using (_×_; _,_)
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Tree/Binary/Zipper.agda
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module Data.Tree.Binary.Zipper where

open import Level using (Level; _⊔_)
open import Data.Tree.Binary as BT using (Tree; node; leaf)
open import Data.List as List using (List; []; _∷_; sum; _++_; [_])
open import Data.List.Base as List using (List; []; _∷_; sum; _++_; [_])
open import Data.Maybe using (Maybe; nothing; just)
open import Data.Nat.Base using (ℕ; suc; _+_)
open import Function
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Vec/Functional/Properties.agda
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ open import Data.Fin.Base
open import Data.Nat as ℕ
import Data.Nat.Properties as ℕₚ
open import Data.Product as Product using (_×_; _,_; proj₁; proj₂)
open import Data.List as L using (List)
open import Data.List.Base as L using (List)
import Data.List.Properties as Lₚ
open import Data.Sum.Base as Sum using (_⊎_; inj₁; inj₂)
open import Data.Vec as V using (Vec)
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Vec/Reflection.agda
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

module Data.Vec.Reflection where

import Data.List as List
import Data.List.Base as List
open import Data.Vec.Base
open import Reflection.AST.Term
open import Reflection.AST.Argument
Expand Down
2 changes: 1 addition & 1 deletion src/Reflection/AST/Show.agda
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module Reflection.AST.Show where

import Data.Char as Char using (show)
import Data.Float as Float using (show)
open import Data.List hiding (_++_; intersperse)
open import Data.List.Base hiding (_++_; intersperse)
import Data.Nat.Show as ℕ using (show)
open import Data.Product using (_×_; _,_)
open import Data.String as String
Expand Down
2 changes: 1 addition & 1 deletion src/Reflection/AST/Traversal.agda
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module Reflection.AST.Traversal
{F : Set → Set} (AppF : RawApplicative F) where

open import Data.Nat using (ℕ; zero; suc; _+_)
open import Data.List using (List; []; _∷_; _++_; reverse; length)
open import Data.List.Base using (List; []; _∷_; _++_; reverse; length)
open import Data.Product using (_×_; _,_)
open import Data.String using (String)
open import Function.Base using (_∘_)
Expand Down
10 changes: 5 additions & 5 deletions src/Tactic/MonoidSolver.agda
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ module Tactic.MonoidSolver where
open import Algebra
open import Function

open import Data.Bool as Bool using (Bool; _∨_; if_then_else_)
open import Data.Maybe as Maybe using (Maybe; just; nothing; maybe)
open import Data.List as List using (List; _∷_; [])
open import Data.Nat as ℕ using (ℕ; suc; zero)
open import Data.Product as Product using (_×_; _,_)
open import Data.Bool as Bool using (Bool; _∨_; if_then_else_)
open import Data.Maybe as Maybe using (Maybe; just; nothing; maybe)
open import Data.List.Base as List using (List; _∷_; [])
open import Data.Nat as ℕ using (ℕ; suc; zero)
open import Data.Product as Product using (_×_; _,_)

open import Reflection.AST
open import Reflection.AST.Term
Expand Down
6 changes: 3 additions & 3 deletions src/Tactic/RingSolver/Core/NatSet.agda
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@

module Tactic.RingSolver.Core.NatSet where

open import Data.Nat as ℕ using (ℕ; suc; zero)
open import Data.List as List using (List; _∷_; [])
open import Data.Nat as ℕ using (ℕ; suc; zero)
open import Data.List.Base as List using (List; _∷_; [])
open import Data.Maybe.Base as Maybe using (Maybe; just; nothing)
open import Data.Bool as Bool using (Bool)
open import Data.Bool as Bool using (Bool)
open import Function
open import Relation.Binary.PropositionalEquality

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module Tactic.RingSolver.Core.Polynomial.Homomorphism.Addition
open import Data.Nat as ℕ using (ℕ; suc; zero; compare; _≤′_; ≤′-step; ≤′-refl)
open import Data.Nat.Properties as ℕₚ using (≤′-trans)
open import Data.Product using (_,_; _×_; proj₂)
open import Data.List using (_∷_; [])
open import Data.List.Base using (_∷_; [])
open import Data.List.Kleene
open import Data.Vec using (Vec)
open import Function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ open import Data.Nat.Base as ℕ using (ℕ; suc; zero;
open import Data.Nat.Properties as ℕₚ using (≤′-trans)
open import Data.Vec.Base as Vec using (Vec; _∷_)
open import Data.Fin using (Fin; zero; suc)
open import Data.List using (_∷_; [])
open import Data.List.Base using (_∷_; [])
open import Data.Unit using (tt)
open import Data.List.Kleene
open import Data.Product using (_,_; proj₁; proj₂; map₁; _×_)
Expand Down
10 changes: 5 additions & 5 deletions src/Tactic/RingSolver/Core/Polynomial/Semantics.agda
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ module Tactic.RingSolver.Core.Polynomial.Semantics
(homo : Homomorphism r₁ r₂ r₃ r₄)
where

open import Data.Nat using (ℕ; suc; zero; _≤′_; ≤′-step; ≤′-refl)
open import Data.Vec using (Vec; []; _∷_; uncons)
open import Data.List using ([]; _∷_)
open import Data.Product using (_,_; _×_)
open import Data.List.Kleene using (_+; _*; ∹_; _&_; [])
open import Data.Nat using (ℕ; suc; zero; _≤′_; ≤′-step; ≤′-refl)
open import Data.Vec using (Vec; []; _∷_; uncons)
open import Data.List.Base using ([]; _∷_)
open import Data.Product using (_,_; _×_)
open import Data.List.Kleene using (_+; _*; ∹_; _&_; [])

open Homomorphism homo hiding (_^_)
open import Tactic.RingSolver.Core.Polynomial.Base from
Expand Down
2 changes: 1 addition & 1 deletion tests/data/appending/Main.agda
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Main where


open import Data.List using (replicate)
open import Data.List.Base using (replicate)
open import Data.String using (toList; fromList)

open import IO
Expand Down
2 changes: 1 addition & 1 deletion tests/data/appending/TakeWhile.agda
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module TakeWhile where

open import Level
open import Data.List hiding (takeWhile)
open import Data.List.Base hiding (takeWhile)
open import Data.List.Relation.Unary.All as List using ([]; _∷_)
open import Data.List.Relation.Binary.Pointwise using (Pointwise; []; _∷_; refl)
open import Data.List.Relation.Ternary.Appending.Propositional
Expand Down
2 changes: 1 addition & 1 deletion tests/data/list/Main.agda
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Main where

open import Level
open import Data.List as List using (List; _∷_; []; _++_; reverse)
open import Data.List.Base as List using (List; _∷_; []; _++_; reverse)
open import Data.List.Zipper
import Data.List.Sort as Sort
open import Data.Maybe.Base
Expand Down
16 changes: 8 additions & 8 deletions tests/data/trie/Main.agda
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ module Main where
open import Level
open import Data.Unit
open import Data.Bool
open import Data.Char as Char hiding (show)
import Data.Char.Properties as Char
open import Data.List as List using (List; []; _∷_)
open import Data.List.Fresh as List# using (List#; []; _∷#_)
open import Data.Maybe as Maybe
open import Data.Product as Prod
open import Data.String as String using (String; unlines; _++_)
open import Data.These as These
open import Data.Char as Char hiding (show)
import Data.Char.Properties as Char
open import Data.List.Base as List using (List; []; _∷_)
open import Data.List.Fresh as List# using (List#; []; _∷#_)
open import Data.Maybe as Maybe
open import Data.Product as Prod
open import Data.String as String using (String; unlines; _++_)
open import Data.These as These

open import Function.Base using (case_of_; _$_; _∘′_; id; _on_)
open import Relation.Nary
Expand Down