Skip to content

Remove (direct) dependency on containers #27

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove (direct) dependency on containers #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions diagnose.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ library
, bytestring >=0.9 && <1
if flag(megaparsec-compat)
build-depends:
containers ==0.6.*
, megaparsec >=9.0.0
megaparsec >=9.0.0
if flag(parsec-compat)
build-depends:
parsec >=3.1.14
Expand Down Expand Up @@ -128,8 +127,7 @@ test-suite diagnose-megaparsec-tests
, bytestring >=0.9 && <1
if flag(megaparsec-compat)
build-depends:
containers ==0.6.*
, megaparsec >=9.0.0
megaparsec >=9.0.0
if flag(parsec-compat)
build-depends:
parsec >=3.1.14
Expand Down Expand Up @@ -169,8 +167,7 @@ test-suite diagnose-parsec-tests
, bytestring >=0.9 && <1
if flag(megaparsec-compat)
build-depends:
containers ==0.6.*
, megaparsec >=9.0.0
megaparsec >=9.0.0
if flag(parsec-compat)
build-depends:
parsec >=3.1.14
Expand Down Expand Up @@ -208,8 +205,7 @@ test-suite diagnose-rendering-tests
, bytestring >=0.9 && <1
if flag(megaparsec-compat)
build-depends:
containers ==0.6.*
, megaparsec >=9.0.0
megaparsec >=9.0.0
if flag(parsec-compat)
build-depends:
parsec >=3.1.14
1 change: 0 additions & 1 deletion package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ when:
- condition: flag(megaparsec-compat)
dependencies:
- megaparsec >= 9.0.0
- containers == 0.6.*
- condition: flag(parsec-compat)
dependencies:
- parsec >= 3.1.14
Expand Down
4 changes: 2 additions & 2 deletions src/Error/Diagnose/Compat/Megaparsec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ module Error.Diagnose.Compat.Megaparsec
where

import Data.Bifunctor (second)
import Data.Foldable (toList)
import Data.Maybe (fromMaybe)
import qualified Data.Set as Set (toList)
import Data.String (IsString (..))
import Error.Diagnose
import Error.Diagnose.Compat.Hints (HasHints (..))
Expand Down Expand Up @@ -71,7 +71,7 @@ diagnosticFromBundle isError code msg (fromMaybe [] -> trivialHints) MP.ParseErr
errorHints :: MP.ParseError s e -> [Note msg]
errorHints MP.TrivialError {} = trivialHints
errorHints (MP.FancyError _ errs) =
Set.toList errs >>= \case
toList errs >>= \case
MP.ErrorCustom e -> hints e
_ -> mempty

Expand Down