Skip to content

Commit 984a1d2

Browse files
committed
ghc-lib-parser 9.10
1 parent 6079787 commit 984a1d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+503
-410
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
ghc: [ghc947, ghc963, ghc981]
15+
ghc: [ghc965, ghc982]
1616
name: Build and test on ${{ matrix.ghc }}
1717
runs-on: ubuntu-latest
1818
steps:

cabal.project

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
packages: . extract-hackage-info
22

33
constraints: ormolu +dev
4+
5+
source-repository-package
6+
type: git
7+
location: https://github.com/amesgen/stuff
8+
tag: 20b6b9d136502ba442fde9e8e2903d29772fcfee
9+
subdir: ghc-lib-parser-9.10.1-rc
10+
--sha256: sha256-s6QUeNV+spH9gR2xhu+Lg2EiI8viGqmIkKnSGZVwILI=

data/examples/backpack/signature-0-out.hsig

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ instance Primitive Prim
1515

1616
name :: String
1717

18-
-- \| The name of the primitive used as the seed stretcher
19-
-- \| Test line 2
18+
-- | The name of the primitive used as the seed stretcher
19+
-- | Test line 2
2020
-- | Test line 3
21-
-- \|Test line 4
21+
-- |Test line 4
2222
primName :: String
2323

2424
randomBlocks ::

data/examples/declaration/value/function/pragmas-out.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
sccfoo = {-# SCC foo #-} 1
1+
sccfoo = {-# SCC "foo" #-} 1
22

33
sccbar =
44
{-# SCC "barbaz" #-}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
vshow :: forall a -> (Show a) => a -> String
2+
vshow t x = show (x :: t)
3+
4+
s1 = vshow Int 42
5+
6+
s2 = vshow Double 42
7+
8+
a1 = f (type (Int -> Bool))
9+
10+
a2 = f (type ((Read T) => T))
11+
12+
a3 = f (type (forall a. a))
13+
14+
a4 = f (type (forall a. (Read a) => String -> a))
15+
16+
foo =
17+
f
18+
( type ( Maybe
19+
Int
20+
)
21+
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
vshow :: forall a -> Show a => a -> String
2+
vshow t x = show (x :: t)
3+
4+
s1 = vshow Int 42
5+
s2 = vshow Double 42
6+
7+
a1 = f (type (Int -> Bool))
8+
a2 = f (type (Read T => T))
9+
a3 = f (type (forall a. a))
10+
a4 = f (type (forall a. Read a => String -> a))
11+
12+
foo = f (type (Maybe
13+
Int))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
id :: forall a. a -> a
2+
id @t x = x :: t
3+
4+
f1 :: forall a. a -> forall b. b -> (a, b)
5+
f1 @a x @b y = (x :: a, y :: b)
6+
7+
f2 =
8+
(\ @a x @b y -> (x :: a, y :: b)) ::
9+
forall a. a -> forall b. b -> (a, b)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
id :: forall a. a -> a
2+
id @t x = x :: t
3+
4+
f1 :: forall a. a -> forall b. b -> (a, b)
5+
f1 @a x @b y = (x :: a, y :: b)
6+
7+
f2 = (\ @a x @b y -> (x :: a, y :: b) )
8+
:: forall a. a -> forall b. b -> (a, b)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module Test
2+
( since1, -- ^ @since 1.0
3+
since2, -- ^ @since 2.0
4+
since3, -- ^ @since 3.0
5+
SinceType (..), -- ^ @since 4.0
6+
SinceClass (..), -- ^ @since 5.0
7+
Multi (..),
8+
-- ^ since 6.0
9+
-- multi
10+
-- line
11+
)
12+
where
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module Test (
2+
since1, -- ^ @since 1.0
3+
since2 -- ^ @since 2.0
4+
, since3 -- ^ @since 3.0
5+
, SinceType(..) -- ^ @since 4.0
6+
, SinceClass(..) -- ^ @since 5.0
7+
, Multi(..)
8+
-- ^ since 6.0
9+
-- multi
10+
-- line
11+
) where

expected-failures/Agda.txt

-48
This file was deleted.

expected-failures/default.nix

-3
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@
33
let
44
inherit (pkgs) lib;
55
expectedFailures = [
6-
"Agda"
76
"brittany"
87
"esqueleto"
98
"hlint"
109
"leksah"
1110
"lens"
12-
"pandoc"
1311
"pipes"
1412
"postgrest"
15-
"purescript"
1613
];
1714
ormolizedPackages =
1815
let

expected-failures/hlint.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ src/Extension.hs
1313
Formatting is not idempotent.
1414
Please, consider reporting the bug.
1515
src/Hint/Bracket.hs
16-
@@ -258,8 +258,11 @@
16+
@@ -265,8 +265,11 @@
1717
let y = noLocA $ HsApp EpAnnNotUsed a1 (nlHsPar a2),
1818
let r = Replace Expr (toSSA e) [("a", toSSA a1), ("b", toSSA a2)] "a (b)"
1919
]

expected-failures/leksah.txt

-16
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,3 @@ src/IDE/Find.hs:615:36-46
22
The GHC parser (in Haddock mode) failed:
33
[GHC-95644] Bang pattern in expression context: !matchIndex
44
Did you mean to add a space after the '!'?
5-
src/IDE/Pane/Modules.hs
6-
@@ -1183,9 +1183,9 @@
7-
let modId = mdModuleId modDescr
8-
modName = modu modId
9-
mFilePath = mdMbSourcePath modDescr
10-
- -- show relative file path for Main modules
11-
+ in -- show relative file path for Main modules
12-
-- since we can have several
13-
- in case (components modName, mFilePath) of
14-
+ case (components modName, mFilePath) of
15-
(["Main"], Just fp) ->
16-
let sfp = case (pdMbSourcePath (snd pair)) of
17-
Nothing -> fp
18-
19-
Formatting is not idempotent.
20-
Please, consider reporting the bug.

expected-failures/pandoc.txt

-28
This file was deleted.

expected-failures/purescript.txt

-41
This file was deleted.

extract-hackage-info/extract-hackage-info.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ executable extract-hackage-info
1111
default-language: GHC2021
1212
ghc-options: -O2 -Wall -rtsopts -Wunused-packages
1313
build-depends:
14-
Cabal-syntax >=3.10 && <3.11,
14+
Cabal-syntax >=3.12 && <3.13,
1515
base >=4.12 && <5,
1616
binary >=0.8 && <0.9,
1717
bytestring >=0.10 && <0.13,
1818
containers >=0.6 && <0.8,
1919
directory >=1 && <2,
20-
filepath >=1.2 && <1.5,
20+
filepath >=1.2 && <1.6,
2121
optparse-applicative >=0.14 && <0.19,
2222
ormolu,
2323
text >=2 && <3,

0 commit comments

Comments
 (0)