Skip to content

Commit 3c4023f

Browse files
MikolajMikolaj
authored
Merge pull request #7473 from skykanin/error-message-context
Provide more context in error messages
2 parents e897220 + 1dc26d1 commit 3c4023f

File tree

14 files changed

+302
-123
lines changed

14 files changed

+302
-123
lines changed

‎Cabal/src/Language/Haskell/Extension.hs

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ module Language.Haskell.Extension (
2222
KnownExtension(..),
2323
deprecatedExtensions,
2424
classifyExtension,
25+
knownExtensions
2526
) where
2627

2728
import qualified Prelude (head)
@@ -931,3 +932,6 @@ knownExtensionTable =
931932
[ (Prelude.head str, (str, extension)) -- assume KnownExtension's Show returns a non-empty string
932933
| extension <- [toEnum 0 ..]
933934
, let str = show extension ]
935+
936+
knownExtensions :: [KnownExtension]
937+
knownExtensions = [minBound .. maxBound]

‎bootstrap/linux-8.10.4.json

+40-39
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
{
1515
"source": "hackage",
1616
"package": "network",
17-
"version": "3.1.2.1",
17+
"version": "3.1.2.2",
1818
"flags": [
1919
"-devel"
2020
],
21-
"cabal_sha256": "188d6daea8cd91bc3553efd5a90a1e7c6d0425fa66a53baa74db5b6d9fd75c8b",
22-
"src_sha256": "fcaa954445cb575ff04d088e719452e356324b6acb98c5aefd2541a069439d4a",
23-
"revision": 1
21+
"cabal_sha256": "218e2968e03d99c40f32a2ef7cc41a848969096ba1c780ff2e57997a00246b06",
22+
"src_sha256": "55012c0b22f9c7548b1f7b3bacc2c6ec7058c7f92238a69561528f1a0fa60eb6",
23+
"revision": 0
2424
},
2525
{
2626
"source": "hackage",
@@ -58,12 +58,13 @@
5858
{
5959
"source": "hackage",
6060
"package": "hashable",
61-
"version": "1.3.1.0",
61+
"version": "1.3.2.0",
6262
"flags": [
63-
"+integer-gmp"
63+
"+integer-gmp",
64+
"-random-initial-seed"
6465
],
65-
"cabal_sha256": "d965e098e06cc585b201da6137dcb31c40f35eb7a937b833903969447985c076",
66-
"src_sha256": "8061823a4ac521b53912edcba36b956f3159cb885b07ec119af295a6568ca7c4",
66+
"cabal_sha256": "02bc544e3546713b1d76a3c5bfc836a5fd19a5b4348ef4a52bb973d0c35a4b89",
67+
"src_sha256": "59bd964b6fe52b04825cf5402c87981068c051f351b2cb940b75f1c60719d637",
6768
"revision": 0
6869
},
6970
{
@@ -95,6 +96,35 @@
9596
"src_sha256": "af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638",
9697
"revision": 0
9798
},
99+
{
100+
"source": "hackage",
101+
"package": "splitmix",
102+
"version": "0.1.0.3",
103+
"flags": [
104+
"-optimised-mixer"
105+
],
106+
"cabal_sha256": "fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c",
107+
"src_sha256": "46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35",
108+
"revision": 0
109+
},
110+
{
111+
"source": "hackage",
112+
"package": "random",
113+
"version": "1.2.0",
114+
"flags": [],
115+
"cabal_sha256": "30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9",
116+
"src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
117+
"revision": 5
118+
},
119+
{
120+
"source": "hackage",
121+
"package": "edit-distance",
122+
"version": "0.2.2.1",
123+
"flags": [],
124+
"cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
125+
"src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
126+
"revision": 1
127+
},
98128
{
99129
"source": "local",
100130
"package": "cabal-install-solver",
@@ -116,9 +146,9 @@
116146
"-exe",
117147
"+use-cbits"
118148
],
119-
"cabal_sha256": "daa34001f8221bf550a3afb278ee9ac3a7257dba187cd7ec4bd5436264b26424",
149+
"cabal_sha256": "797a0af7b8a0e654cbddd3df6b9de02d2cbfcb2292cf001399ab53910fbbb76c",
120150
"src_sha256": "8ad6e9875a9128f6cd66d65d80f9f85dd0559c73ac00bb37f71fbee820d10519",
121-
"revision": 0
151+
"revision": 1
122152
},
123153
{
124154
"source": "hackage",
@@ -131,35 +161,6 @@
131161
"src_sha256": "c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43",
132162
"revision": 0
133163
},
134-
{
135-
"source": "hackage",
136-
"package": "splitmix",
137-
"version": "0.1.0.3",
138-
"flags": [
139-
"-optimised-mixer"
140-
],
141-
"cabal_sha256": "fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c",
142-
"src_sha256": "46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35",
143-
"revision": 0
144-
},
145-
{
146-
"source": "hackage",
147-
"package": "random",
148-
"version": "1.2.0",
149-
"flags": [],
150-
"cabal_sha256": "30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9",
151-
"src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
152-
"revision": 5
153-
},
154-
{
155-
"source": "hackage",
156-
"package": "edit-distance",
157-
"version": "0.2.2.1",
158-
"flags": [],
159-
"cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
160-
"src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
161-
"revision": 1
162-
},
163164
{
164165
"source": "hackage",
165166
"package": "ed25519",

‎bootstrap/linux-8.10.4.plan.json

+1-1
Large diffs are not rendered by default.

‎bootstrap/linux-8.6.5.json

+40-39
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
{
1515
"source": "hackage",
1616
"package": "network",
17-
"version": "3.1.2.1",
17+
"version": "3.1.2.2",
1818
"flags": [
1919
"-devel"
2020
],
21-
"cabal_sha256": "188d6daea8cd91bc3553efd5a90a1e7c6d0425fa66a53baa74db5b6d9fd75c8b",
22-
"src_sha256": "fcaa954445cb575ff04d088e719452e356324b6acb98c5aefd2541a069439d4a",
23-
"revision": 1
21+
"cabal_sha256": "218e2968e03d99c40f32a2ef7cc41a848969096ba1c780ff2e57997a00246b06",
22+
"src_sha256": "55012c0b22f9c7548b1f7b3bacc2c6ec7058c7f92238a69561528f1a0fa60eb6",
23+
"revision": 0
2424
},
2525
{
2626
"source": "hackage",
@@ -58,12 +58,13 @@
5858
{
5959
"source": "hackage",
6060
"package": "hashable",
61-
"version": "1.3.1.0",
61+
"version": "1.3.2.0",
6262
"flags": [
63-
"+integer-gmp"
63+
"+integer-gmp",
64+
"-random-initial-seed"
6465
],
65-
"cabal_sha256": "d965e098e06cc585b201da6137dcb31c40f35eb7a937b833903969447985c076",
66-
"src_sha256": "8061823a4ac521b53912edcba36b956f3159cb885b07ec119af295a6568ca7c4",
66+
"cabal_sha256": "02bc544e3546713b1d76a3c5bfc836a5fd19a5b4348ef4a52bb973d0c35a4b89",
67+
"src_sha256": "59bd964b6fe52b04825cf5402c87981068c051f351b2cb940b75f1c60719d637",
6768
"revision": 0
6869
},
6970
{
@@ -95,6 +96,35 @@
9596
"src_sha256": "af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638",
9697
"revision": 0
9798
},
99+
{
100+
"source": "hackage",
101+
"package": "splitmix",
102+
"version": "0.1.0.3",
103+
"flags": [
104+
"-optimised-mixer"
105+
],
106+
"cabal_sha256": "fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c",
107+
"src_sha256": "46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35",
108+
"revision": 0
109+
},
110+
{
111+
"source": "hackage",
112+
"package": "random",
113+
"version": "1.2.0",
114+
"flags": [],
115+
"cabal_sha256": "30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9",
116+
"src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
117+
"revision": 5
118+
},
119+
{
120+
"source": "hackage",
121+
"package": "edit-distance",
122+
"version": "0.2.2.1",
123+
"flags": [],
124+
"cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
125+
"src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
126+
"revision": 1
127+
},
98128
{
99129
"source": "local",
100130
"package": "cabal-install-solver",
@@ -116,9 +146,9 @@
116146
"-exe",
117147
"+use-cbits"
118148
],
119-
"cabal_sha256": "daa34001f8221bf550a3afb278ee9ac3a7257dba187cd7ec4bd5436264b26424",
149+
"cabal_sha256": "797a0af7b8a0e654cbddd3df6b9de02d2cbfcb2292cf001399ab53910fbbb76c",
120150
"src_sha256": "8ad6e9875a9128f6cd66d65d80f9f85dd0559c73ac00bb37f71fbee820d10519",
121-
"revision": 0
151+
"revision": 1
122152
},
123153
{
124154
"source": "hackage",
@@ -131,35 +161,6 @@
131161
"src_sha256": "c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43",
132162
"revision": 0
133163
},
134-
{
135-
"source": "hackage",
136-
"package": "splitmix",
137-
"version": "0.1.0.3",
138-
"flags": [
139-
"-optimised-mixer"
140-
],
141-
"cabal_sha256": "fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c",
142-
"src_sha256": "46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35",
143-
"revision": 0
144-
},
145-
{
146-
"source": "hackage",
147-
"package": "random",
148-
"version": "1.2.0",
149-
"flags": [],
150-
"cabal_sha256": "30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9",
151-
"src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
152-
"revision": 5
153-
},
154-
{
155-
"source": "hackage",
156-
"package": "edit-distance",
157-
"version": "0.2.2.1",
158-
"flags": [],
159-
"cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
160-
"src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
161-
"revision": 1
162-
},
163164
{
164165
"source": "hackage",
165166
"package": "exceptions",

‎bootstrap/linux-8.6.5.plan.json

+1-1
Large diffs are not rendered by default.

‎bootstrap/linux-8.8.4.json

+40-39
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
{
1515
"source": "hackage",
1616
"package": "network",
17-
"version": "3.1.2.1",
17+
"version": "3.1.2.2",
1818
"flags": [
1919
"-devel"
2020
],
21-
"cabal_sha256": "188d6daea8cd91bc3553efd5a90a1e7c6d0425fa66a53baa74db5b6d9fd75c8b",
22-
"src_sha256": "fcaa954445cb575ff04d088e719452e356324b6acb98c5aefd2541a069439d4a",
23-
"revision": 1
21+
"cabal_sha256": "218e2968e03d99c40f32a2ef7cc41a848969096ba1c780ff2e57997a00246b06",
22+
"src_sha256": "55012c0b22f9c7548b1f7b3bacc2c6ec7058c7f92238a69561528f1a0fa60eb6",
23+
"revision": 0
2424
},
2525
{
2626
"source": "hackage",
@@ -58,12 +58,13 @@
5858
{
5959
"source": "hackage",
6060
"package": "hashable",
61-
"version": "1.3.1.0",
61+
"version": "1.3.2.0",
6262
"flags": [
63-
"+integer-gmp"
63+
"+integer-gmp",
64+
"-random-initial-seed"
6465
],
65-
"cabal_sha256": "d965e098e06cc585b201da6137dcb31c40f35eb7a937b833903969447985c076",
66-
"src_sha256": "8061823a4ac521b53912edcba36b956f3159cb885b07ec119af295a6568ca7c4",
66+
"cabal_sha256": "02bc544e3546713b1d76a3c5bfc836a5fd19a5b4348ef4a52bb973d0c35a4b89",
67+
"src_sha256": "59bd964b6fe52b04825cf5402c87981068c051f351b2cb940b75f1c60719d637",
6768
"revision": 0
6869
},
6970
{
@@ -95,6 +96,35 @@
9596
"src_sha256": "af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638",
9697
"revision": 0
9798
},
99+
{
100+
"source": "hackage",
101+
"package": "splitmix",
102+
"version": "0.1.0.3",
103+
"flags": [
104+
"-optimised-mixer"
105+
],
106+
"cabal_sha256": "fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c",
107+
"src_sha256": "46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35",
108+
"revision": 0
109+
},
110+
{
111+
"source": "hackage",
112+
"package": "random",
113+
"version": "1.2.0",
114+
"flags": [],
115+
"cabal_sha256": "30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9",
116+
"src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
117+
"revision": 5
118+
},
119+
{
120+
"source": "hackage",
121+
"package": "edit-distance",
122+
"version": "0.2.2.1",
123+
"flags": [],
124+
"cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
125+
"src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
126+
"revision": 1
127+
},
98128
{
99129
"source": "local",
100130
"package": "cabal-install-solver",
@@ -116,9 +146,9 @@
116146
"-exe",
117147
"+use-cbits"
118148
],
119-
"cabal_sha256": "daa34001f8221bf550a3afb278ee9ac3a7257dba187cd7ec4bd5436264b26424",
149+
"cabal_sha256": "797a0af7b8a0e654cbddd3df6b9de02d2cbfcb2292cf001399ab53910fbbb76c",
120150
"src_sha256": "8ad6e9875a9128f6cd66d65d80f9f85dd0559c73ac00bb37f71fbee820d10519",
121-
"revision": 0
151+
"revision": 1
122152
},
123153
{
124154
"source": "hackage",
@@ -131,35 +161,6 @@
131161
"src_sha256": "c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43",
132162
"revision": 0
133163
},
134-
{
135-
"source": "hackage",
136-
"package": "splitmix",
137-
"version": "0.1.0.3",
138-
"flags": [
139-
"-optimised-mixer"
140-
],
141-
"cabal_sha256": "fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c",
142-
"src_sha256": "46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35",
143-
"revision": 0
144-
},
145-
{
146-
"source": "hackage",
147-
"package": "random",
148-
"version": "1.2.0",
149-
"flags": [],
150-
"cabal_sha256": "30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9",
151-
"src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
152-
"revision": 5
153-
},
154-
{
155-
"source": "hackage",
156-
"package": "edit-distance",
157-
"version": "0.2.2.1",
158-
"flags": [],
159-
"cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
160-
"src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
161-
"revision": 1
162-
},
163164
{
164165
"source": "hackage",
165166
"package": "exceptions",

‎bootstrap/linux-8.8.4.plan.json

+1-1
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)