Skip to content
This repository was archived by the owner on Aug 3, 2024. It is now read-only.

Commit 9d70a0c

Browse files
bgamaribgamari
committed
Merge branch 'ghc-9.10' into ghc-head
2 parents 9ec56ce + 243fefa commit 9d70a0c

16 files changed

+102
-90
lines changed

‎haddock.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ executable haddock
6868

6969
-- haddock typically only supports a single GHC major version
7070
build-depends:
71-
base ^>= 4.13.0.0 || ^>= 4.14.0.0 || ^>= 4.15.0.0 || ^>= 4.16.0.0 || ^>= 4.17.0.0 || ^>= 4.18.0.0 || ^>= 4.19.0.0
71+
base ^>= 4.13.0.0 || ^>= 4.14.0.0 || ^>= 4.15.0.0 || ^>= 4.16.0.0 || ^>= 4.17.0.0 || ^>= 4.18.0.0 || ^>= 4.19.0.0 || ^>= 4.20.0.0
7272

7373
if flag(in-ghc-tree)
7474
hs-source-dirs: haddock-api/src, haddock-library/src
@@ -83,7 +83,7 @@ executable haddock
8383
xhtml >= 3000.2 && < 3000.3,
8484
ghc-boot,
8585
ghc-boot-th,
86-
ghc == 9.9.*,
86+
ghc == 9.10.*,
8787
bytestring,
8888
parsec,
8989
text,

‎hypsrc-test/ref/src/CPP.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@
2424
>module</span
2525
><span
2626
> </span
27-
><span class="hs-identifier"
28-
>CPP</span
27+
><span class="annot"
28+
><a href="CPP.html"
29+
><span class="hs-identifier"
30+
>CPP</span
31+
></a
32+
></span
2933
><span
3034
> </span
3135
><span class="hs-keyword"

‎hypsrc-test/ref/src/Classes.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
>module</span
1818
><span
1919
> </span
20-
><span class="hs-identifier"
21-
>Classes</span
20+
><span class="annot"
21+
><a href="Classes.html"
22+
><span class="hs-identifier"
23+
>Classes</span
24+
></a
25+
></span
2226
><span
2327
> </span
2428
><span class="hs-keyword"

‎hypsrc-test/ref/src/Constructors.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
>module</span
1818
><span
1919
> </span
20-
><span class="hs-identifier"
21-
>Constructors</span
20+
><span class="annot"
21+
><a href="Constructors.html"
22+
><span class="hs-identifier"
23+
>Constructors</span
24+
></a
25+
></span
2226
><span
2327
> </span
2428
><span class="hs-keyword"

‎hypsrc-test/ref/src/Identifiers.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
>module</span
1818
><span
1919
> </span
20-
><span class="hs-identifier"
21-
>Identifiers</span
20+
><span class="annot"
21+
><a href="Identifiers.html"
22+
><span class="hs-identifier"
23+
>Identifiers</span
24+
></a
25+
></span
2226
><span
2327
> </span
2428
><span class="hs-keyword"

‎hypsrc-test/ref/src/LinkingIdentifiers.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,12 @@
5252
>module</span
5353
><span
5454
> </span
55-
><span class="hs-identifier"
56-
>LinkingIdentifiers</span
55+
><span class="annot"
56+
><a href="LinkingIdentifiers.html"
57+
><span class="hs-identifier"
58+
>LinkingIdentifiers</span
59+
></a
60+
></span
5761
><span
5862
> </span
5963
><span class="hs-keyword"

‎hypsrc-test/ref/src/Literals.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
>module</span
1818
><span
1919
> </span
20-
><span class="hs-identifier"
21-
>Literals</span
20+
><span class="annot"
21+
><a href="Literals.html"
22+
><span class="hs-identifier"
23+
>Literals</span
24+
></a
25+
></span
2226
><span
2327
> </span
2428
><span class="hs-keyword"

‎hypsrc-test/ref/src/Operators.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
>module</span
1818
><span
1919
> </span
20-
><span class="hs-identifier"
21-
>Operators</span
20+
><span class="annot"
21+
><a href="Operators.html"
22+
><span class="hs-identifier"
23+
>Operators</span
24+
></a
25+
></span
2226
><span
2327
> </span
2428
><span class="hs-keyword"

‎hypsrc-test/ref/src/Polymorphism.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@
4141
>module</span
4242
><span
4343
> </span
44-
><span class="hs-identifier"
45-
>Polymorphism</span
44+
><span class="annot"
45+
><a href="Polymorphism.html"
46+
><span class="hs-identifier"
47+
>Polymorphism</span
48+
></a
49+
></span
4650
><span
4751
> </span
4852
><span class="hs-keyword"

‎hypsrc-test/ref/src/PositionPragmas.html

+16-60
Original file line numberDiff line numberDiff line change
@@ -45,53 +45,31 @@
4545
</span
4646
><span id="line-9"
4747
></span
48-
><span class="annot"
49-
><a href="PositionPragmas.html#foo"
50-
><span class="hs-identifier hs-type"
51-
>foo</span
52-
></a
53-
></span
48+
><span class="hs-identifier"
49+
>foo</span
5450
><span
5551
> </span
5652
><span class="hs-glyph"
5753
>::</span
5854
><span
5955
> </span
60-
><span class="annot"
61-
><span class="hs-identifier hs-type"
62-
>String</span
63-
></span
56+
><span class="hs-identifier"
57+
>String</span
6458
><span
6559
>
6660
</span
6761
><span id="line-10"
6862
></span
69-
><span id="foo"
70-
><span class="annot"
71-
><span class="annottext"
72-
>foo :: String
73-
</span
74-
><a href="PositionPragmas.html#foo"
75-
><span class="hs-identifier hs-var hs-var"
76-
>foo</span
77-
></a
78-
></span
79-
></span
63+
><span class="hs-identifier"
64+
>foo</span
8065
><span
8166
> </span
8267
><span class="hs-glyph"
8368
>=</span
8469
><span
8570
> </span
86-
><span class="annot"
87-
><span class="annottext"
88-
>String
89-
</span
90-
><a href="PositionPragmas.html#bar"
91-
><span class="hs-identifier hs-var"
92-
>bar</span
93-
></a
94-
></span
71+
><span class="hs-identifier"
72+
>bar</span
9573
><span
9674
>
9775
</span
@@ -114,53 +92,31 @@
11492
</span
11593
><span id="line-24"
11694
></span
117-
><span class="annot"
118-
><a href="PositionPragmas.html#bar"
119-
><span class="hs-identifier hs-type"
120-
>bar</span
121-
></a
122-
></span
95+
><span class="hs-identifier"
96+
>bar</span
12397
><span
12498
> </span
12599
><span class="hs-glyph"
126100
>::</span
127101
><span
128102
> </span
129-
><span class="annot"
130-
><span class="hs-identifier hs-type"
131-
>String</span
132-
></span
103+
><span class="hs-identifier"
104+
>String</span
133105
><span
134106
>
135107
</span
136108
><span id="line-25"
137109
></span
138-
><span id="bar"
139-
><span class="annot"
140-
><span class="annottext"
141-
>bar :: String
142-
</span
143-
><a href="PositionPragmas.html#bar"
144-
><span class="hs-identifier hs-var hs-var"
145-
>bar</span
146-
></a
147-
></span
148-
></span
110+
><span class="hs-identifier"
111+
>bar</span
149112
><span
150113
> </span
151114
><span class="hs-glyph"
152115
>=</span
153116
><span
154117
> </span
155-
><span class="annot"
156-
><span class="annottext"
157-
>String
158-
</span
159-
><a href="PositionPragmas.html#foo"
160-
><span class="hs-identifier hs-var"
161-
>foo</span
162-
></a
163-
></span
118+
><span class="hs-identifier"
119+
>foo</span
164120
><span
165121
> </span
166122
><span

‎hypsrc-test/ref/src/Quasiquoter.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
>module</span
1818
><span
1919
> </span
20-
><span class="hs-identifier"
21-
>Quasiquoter</span
20+
><span class="annot"
21+
><a href="Quasiquoter.html"
22+
><span class="hs-identifier"
23+
>Quasiquoter</span
24+
></a
25+
></span
2226
><span
2327
> </span
2428
><span class="hs-special"

‎hypsrc-test/ref/src/Records.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@
4141
>module</span
4242
><span
4343
> </span
44-
><span class="hs-identifier"
45-
>Records</span
44+
><span class="annot"
45+
><a href="Records.html"
46+
><span class="hs-identifier"
47+
>Records</span
48+
></a
49+
></span
4650
><span
4751
> </span
4852
><span class="hs-keyword"

‎hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,12 @@
2929
>module</span
3030
><span
3131
> </span
32-
><span class="hs-identifier"
33-
>TemplateHaskellQuasiquotes</span
32+
><span class="annot"
33+
><a href="TemplateHaskellQuasiquotes.html"
34+
><span class="hs-identifier"
35+
>TemplateHaskellQuasiquotes</span
36+
></a
37+
></span
3438
><span
3539
> </span
3640
><span class="hs-keyword"

‎hypsrc-test/ref/src/TemplateHaskellSplices.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@
2424
>module</span
2525
><span
2626
> </span
27-
><span class="hs-identifier"
28-
>TemplateHaskellSplices</span
27+
><span class="annot"
28+
><a href="TemplateHaskellSplices.html"
29+
><span class="hs-identifier"
30+
>TemplateHaskellSplices</span
31+
></a
32+
></span
2933
><span
3034
> </span
3135
><span class="hs-keyword"

‎hypsrc-test/ref/src/Types.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@
3434
>module</span
3535
><span
3636
> </span
37-
><span class="hs-identifier"
38-
>Types</span
37+
><span class="annot"
38+
><a href="Types.html"
39+
><span class="hs-identifier"
40+
>Types</span
41+
></a
42+
></span
3943
><span
4044
> </span
4145
><span class="hs-keyword"

‎hypsrc-test/ref/src/UsingQuasiquotes.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@
2424
>module</span
2525
><span
2626
> </span
27-
><span class="hs-identifier"
28-
>UsingQuasiquotes</span
27+
><span class="annot"
28+
><a href="UsingQuasiquotes.html"
29+
><span class="hs-identifier"
30+
>UsingQuasiquotes</span
31+
></a
32+
></span
2933
><span
3034
> </span
3135
><span class="hs-keyword"

0 commit comments

Comments
 (0)