Skip to content
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 src/Disco/Effects/Store.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
-- Polysemy effect for a memory store with integer keys.
module Disco.Effects.Store where

import Data.Proxy
import qualified Data.IntMap.Lazy as IntMap
import Data.IntSet (IntSet)
import qualified Data.IntSet as IntSet
import Data.Proxy

import Disco.Effects.Counter
import Polysemy
Expand Down
2 changes: 1 addition & 1 deletion src/Disco/Messages.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE QuantifiedConstraints #-}
{-# LANGUAGE TemplateHaskell #-}

-- |
-- Module : Disco.Messages
Expand Down
10 changes: 5 additions & 5 deletions src/Disco/Pretty.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# LANGUAGE DerivingVia #-}
{-# LANGUAGE ImportQualifiedPost #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE NoMonomorphismRestriction #-}
{-# LANGUAGE ImportQualifiedPost #-}

-- TODO: the calls to 'error' should be replaced with logging/error capabilities.

Expand All @@ -17,7 +17,7 @@ module Disco.Pretty (
module Disco.Pretty.DSL,
module Disco.Pretty,
module Disco.Pretty.Prec,
Doc
Doc,
)
where

Expand All @@ -26,12 +26,12 @@ import Prelude hiding ((<>))
import Data.Bifunctor
import Data.Char (isAlpha)
import Data.List.NonEmpty (NonEmpty)
import qualified Data.List.NonEmpty as NE
import Data.List.NonEmpty qualified as NE
import Data.Map (Map)
import qualified Data.Map as M
import Data.Map qualified as M
import Data.Ratio
import Data.Set (Set)
import qualified Data.Set as S
import Data.Set qualified as S
import Disco.Effects.LFresh
import Disco.Pretty.DSL
import Disco.Pretty.Prec
Expand Down
2 changes: 1 addition & 1 deletion src/Disco/Typecheck.hs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import qualified Disco.Subst as Subst
import Disco.Syntax.Operators
import Disco.Syntax.Prims
import Disco.Typecheck.Constraints
import Disco.Typecheck.Solve (SolutionLimit (..), solveConstraint, SolveError)
import Disco.Typecheck.Solve (SolutionLimit (..), SolveError, solveConstraint)
import Disco.Typecheck.Util
import Disco.Types
import Disco.Types.Rules
Expand Down
2 changes: 1 addition & 1 deletion src/Disco/Typecheck/Solve.hs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
-- checking/inference.
module Disco.Typecheck.Solve where

import Data.Proxy
import Control.Arrow ((&&&), (***))
import Control.Lens hiding (use, (%=), (.=))
import Control.Monad (forM, join, unless, zipWithM)
Expand All @@ -37,6 +36,7 @@ import Data.Maybe (
mapMaybe,
)
import Data.Monoid (First (..))
import Data.Proxy
import Data.Semigroup (sconcat)
import Data.Set (Set)
import Data.Set qualified as S
Expand Down