diff options
| author | Griffin Smith <grfn@gws.fyi> | 2020-06-29T01·45-0400 |
|---|---|---|
| committer | glittershark <grfn@gws.fyi> | 2020-07-03T14·41+0000 |
| commit | beb29128b65f163997881fd4f6a3e06fdd4c3569 (patch) | |
| tree | 3ccf6a76459979c68e368b10efbdd24548d34ffe /users/glittershark/xanthous/src/Xanthous/Entities | |
| parent | 96fa6c465b434de3cd6b1fb7dc03a16e9376638c (diff) | |
fix(xan): fix compat with new base+ghc r/1187
A couple of changes necessary to get things working with both ghc 8.8.3 and the new base: - Explicitly import fail from Control.Monad.Fail in the prelude, since it's there instead of the base prelude now - GHC no longer allows type family equality constraints in quantified constraints - which is a bummer - but is avoidable in the one case where it was happening - Explicitly import a constructor from Data.List.NonEmpty Change-Id: Ia06fc724ddc2d6a3f9024c047ed55eea40bcf408 Reviewed-on: https://cl.tvl.fyi/c/depot/+/744 Tested-by: BuildkiteCI Reviewed-by: BuildkiteCI Reviewed-by: Profpatsch <mail@profpatsch.de>
Diffstat (limited to 'users/glittershark/xanthous/src/Xanthous/Entities')
| -rw-r--r-- | users/glittershark/xanthous/src/Xanthous/Entities/Marker.hs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Marker.hs b/users/glittershark/xanthous/src/Xanthous/Entities/Marker.hs index 92969ec342a0..14d02872ed4e 100644 --- a/users/glittershark/xanthous/src/Xanthous/Entities/Marker.hs +++ b/users/glittershark/xanthous/src/Xanthous/Entities/Marker.hs @@ -11,7 +11,6 @@ import Brick.Widgets.Core (raw) -------------------------------------------------------------------------------- import Xanthous.Game.State import Xanthous.Data.Entities (EntityAttributes(..)) -import Xanthous.Data.EntityChar (style) -------------------------------------------------------------------------------- -- | Mark on the map - for use in debugging / development only. |