Skip to content

Commit aa9f155

Browse files
committed
Make it build with ghc 9.8. Adjust CI config
1 parent a545932 commit aa9f155

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/cabal.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
strategy:
1010
matrix:
1111
os: [ubuntu-latest, macOS-latest]
12-
ghc: ["9.4", "9.6", "9.8", "9.10"]
12+
ghc: ["9.6", "9.8", "9.10"]
1313
fail-fast: false
1414

1515
steps:
1616
- uses: actions/checkout@v2
1717

18-
- uses: haskell/actions/setup@v2
18+
- uses: haskell-actions/setup@v2
1919
name: Setup Haskell Cabal
2020
with:
2121
ghc-version: ${{ matrix.ghc }}

lib/Language/Haskell/Stylish/Step/SimpleAlign.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ module Language.Haskell.Stylish.Step.SimpleAlign
1313
import Data.Either (partitionEithers)
1414
import Data.Foldable (toList)
1515
import Data.List (foldl1', sortOn)
16+
import qualified Data.List as List
1617
import Data.Maybe (fromMaybe)
1718
import qualified GHC.Hs as Hs
1819
import qualified GHC.Parser.Annotation as GHC
@@ -117,7 +118,7 @@ matchToAlignable (GHC.L matchLoc m@(Hs.Match _ Hs.CaseAlt pats@(_ : _) grhss)) =
117118
pat = last patsLocs
118119
guards = getGuards m
119120
guardsLocs = map GHC.getLocA guards
120-
left = foldl' GHC.combineSrcSpans pat guardsLocs
121+
left = List.foldl' GHC.combineSrcSpans pat guardsLocs
121122
body <- rhsBody grhss
122123
matchPos <- GHC.srcSpanToRealSrcSpan $ GHC.locA matchLoc
123124
leftPos <- GHC.srcSpanToRealSrcSpan left

0 commit comments

Comments
 (0)