simonmichael/hledger
1
1
Fork 0
mirror of https://github.com/simonmichael/hledger.git synced 2024-11-07 21:15:19 +03:00
Code Issues Projects Releases Wiki Activity

fix: Hide ambiguous instance for (!?)

Browse Source 
base 4.19.0.0 introduces Data.List.!? which clashes with Data.Vector.!?, the latter of which is needed for vector operations.
This commit is contained in:
Vekhir 2024-02-18 23:53:29 +01:00 committed by Simon Michael
parent 32328e33de
commit de3209a2fb
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hledger-ui/Hledger/UI/AccountsScreen.hs
View File

@ -1,5 +1,6 @@
-- The accounts screen, showing accounts and balances like the CLI balance command. -- The accounts screen, showing accounts and balances like the CLI balance command.
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RecordWildCards #-} {-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE TupleSections #-} {-# LANGUAGE TupleSections #-}
@ -23,7 +24,11 @@ import Brick.Widgets.List
import Brick.Widgets.Edit import Brick.Widgets.Edit
import Control.Monad import Control.Monad
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
#if MIN_VERSION_base(4,19,0)
import Data.List hiding (reverse, (!?))
#else
import Data.List hiding (reverse) import Data.List hiding (reverse)
#endif
import Data.Maybe import Data.Maybe
import qualified Data.Text as T import qualified Data.Text as T
import Data.Time.Calendar (Day) import Data.Time.Calendar (Day)

4
hledger-ui/Hledger/UI/RegisterScreen.hs
View File

@ -19,7 +19,11 @@ where
import Control.Monad import Control.Monad
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
import Data.Bifunctor (bimap, Bifunctor (second)) import Data.Bifunctor (bimap, Bifunctor (second))
#if MIN_VERSION_base(4,19,0)
import Data.List hiding ((!?))
#else
import Data.List import Data.List
#endif
import Data.Maybe import Data.Maybe
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Vector as V import qualified Data.Vector as V