Skip to content

Commit

Permalink
Merge pull request #7473 from skykanin/error-message-context
Browse files Browse the repository at this point in the history 
Provide more context in error messages
  • Loading branch information
@Mikolaj
Mikolaj authored Jul 12, 2021
2 parents e897220 + 1dc26d1 commit 3c4023f
Show file tree
Hide file tree
Showing 14 changed files with 302 additions and 123 deletions.
4 changes: 4 additions & 0 deletions Cabal/src/Language/Haskell/Extension.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module Language.Haskell.Extension (
KnownExtension(..),
deprecatedExtensions,
classifyExtension,
knownExtensions
) where

import qualified Prelude (head)
Expand Down Expand Up @@ -931,3 +932,6 @@ knownExtensionTable =
[ (Prelude.head str, (str, extension)) -- assume KnownExtension's Show returns a non-empty string
| extension <- [toEnum 0 ..]
, let str = show extension ]

knownExtensions :: [KnownExtension]
knownExtensions = [minBound .. maxBound]
79 changes: 40 additions & 39 deletions bootstrap/linux-8.10.4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
{
"source": "hackage",
"package": "network",
"version": "3.1.2.1",
"version": "3.1.2.2",
"flags": [
"-devel"
],
"cabal_sha256": "188d6daea8cd91bc3553efd5a90a1e7c6d0425fa66a53baa74db5b6d9fd75c8b",
"src_sha256": "fcaa954445cb575ff04d088e719452e356324b6acb98c5aefd2541a069439d4a",
"revision": 1
"cabal_sha256": "218e2968e03d99c40f32a2ef7cc41a848969096ba1c780ff2e57997a00246b06",
"src_sha256": "55012c0b22f9c7548b1f7b3bacc2c6ec7058c7f92238a69561528f1a0fa60eb6",
"revision": 0
},
{
"source": "hackage",
Expand Down Expand Up @@ -58,12 +58,13 @@
{
"source": "hackage",
"package": "hashable",
"version": "1.3.1.0",
"version": "1.3.2.0",
"flags": [
"+integer-gmp"
"+integer-gmp",
"-random-initial-seed"
],
"cabal_sha256": "d965e098e06cc585b201da6137dcb31c40f35eb7a937b833903969447985c076",
"src_sha256": "8061823a4ac521b53912edcba36b956f3159cb885b07ec119af295a6568ca7c4",
"cabal_sha256": "02bc544e3546713b1d76a3c5bfc836a5fd19a5b4348ef4a52bb973d0c35a4b89",
"src_sha256": "59bd964b6fe52b04825cf5402c87981068c051f351b2cb940b75f1c60719d637",
"revision": 0
},
{
Expand Down Expand Up @@ -95,6 +96,35 @@
"src_sha256": "af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638",
"revision": 0
},
{
"source": "hackage",
"package": "splitmix",
"version": "0.1.0.3",
"flags": [
"-optimised-mixer"
],
"cabal_sha256": "fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c",
"src_sha256": "46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35",
"revision": 0
},
{
"source": "hackage",
"package": "random",
"version": "1.2.0",
"flags": [],
"cabal_sha256": "30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9",
"src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
"revision": 5
},
{
"source": "hackage",
"package": "edit-distance",
"version": "0.2.2.1",
"flags": [],
"cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
"src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
"revision": 1
},
{
"source": "local",
"package": "cabal-install-solver",
Expand All @@ -116,9 +146,9 @@
"-exe",
"+use-cbits"
],
"cabal_sha256": "daa34001f8221bf550a3afb278ee9ac3a7257dba187cd7ec4bd5436264b26424",
"cabal_sha256": "797a0af7b8a0e654cbddd3df6b9de02d2cbfcb2292cf001399ab53910fbbb76c",
"src_sha256": "8ad6e9875a9128f6cd66d65d80f9f85dd0559c73ac00bb37f71fbee820d10519",
"revision": 0
"revision": 1
},
{
"source": "hackage",
Expand All @@ -131,35 +161,6 @@
"src_sha256": "c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43",
"revision": 0
},
{
"source": "hackage",
"package": "splitmix",
"version": "0.1.0.3",
"flags": [
"-optimised-mixer"
],
"cabal_sha256": "fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c",
"src_sha256": "46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35",
"revision": 0
},
{
"source": "hackage",
"package": "random",
"version": "1.2.0",
"flags": [],
"cabal_sha256": "30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9",
"src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
"revision": 5
},
{
"source": "hackage",
"package": "edit-distance",
"version": "0.2.2.1",
"flags": [],
"cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
"src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
"revision": 1
},
{
"source": "hackage",
"package": "ed25519",
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/linux-8.10.4.plan.json
View file

Large diffs are not rendered by default.

79 changes: 40 additions & 39 deletions bootstrap/linux-8.6.5.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
{
"source": "hackage",
"package": "network",
"version": "3.1.2.1",
"version": "3.1.2.2",
"flags": [
"-devel"
],
"cabal_sha256": "188d6daea8cd91bc3553efd5a90a1e7c6d0425fa66a53baa74db5b6d9fd75c8b",
"src_sha256": "fcaa954445cb575ff04d088e719452e356324b6acb98c5aefd2541a069439d4a",
"revision": 1
"cabal_sha256": "218e2968e03d99c40f32a2ef7cc41a848969096ba1c780ff2e57997a00246b06",
"src_sha256": "55012c0b22f9c7548b1f7b3bacc2c6ec7058c7f92238a69561528f1a0fa60eb6",
"revision": 0
},
{
"source": "hackage",
Expand Down Expand Up @@ -58,12 +58,13 @@
{
"source": "hackage",
"package": "hashable",
"version": "1.3.1.0",
"version": "1.3.2.0",
"flags": [
"+integer-gmp"
"+integer-gmp",
"-random-initial-seed"
],
"cabal_sha256": "d965e098e06cc585b201da6137dcb31c40f35eb7a937b833903969447985c076",
"src_sha256": "8061823a4ac521b53912edcba36b956f3159cb885b07ec119af295a6568ca7c4",
"cabal_sha256": "02bc544e3546713b1d76a3c5bfc836a5fd19a5b4348ef4a52bb973d0c35a4b89",
"src_sha256": "59bd964b6fe52b04825cf5402c87981068c051f351b2cb940b75f1c60719d637",
"revision": 0
},
{
Expand Down Expand Up @@ -95,6 +96,35 @@
"src_sha256": "af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638",
"revision": 0
},
{
"source": "hackage",
"package": "splitmix",
"version": "0.1.0.3",
"flags": [
"-optimised-mixer"
],
"cabal_sha256": "fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c",
"src_sha256": "46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35",
"revision": 0
},
{
"source": "hackage",
"package": "random",
"version": "1.2.0",
"flags": [],
"cabal_sha256": "30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9",
"src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
"revision": 5
},
{
"source": "hackage",
"package": "edit-distance",
"version": "0.2.2.1",
"flags": [],
"cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
"src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
"revision": 1
},
{
"source": "local",
"package": "cabal-install-solver",
Expand All @@ -116,9 +146,9 @@
"-exe",
"+use-cbits"
],
"cabal_sha256": "daa34001f8221bf550a3afb278ee9ac3a7257dba187cd7ec4bd5436264b26424",
"cabal_sha256": "797a0af7b8a0e654cbddd3df6b9de02d2cbfcb2292cf001399ab53910fbbb76c",
"src_sha256": "8ad6e9875a9128f6cd66d65d80f9f85dd0559c73ac00bb37f71fbee820d10519",
"revision": 0
"revision": 1
},
{
"source": "hackage",
Expand All @@ -131,35 +161,6 @@
"src_sha256": "c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43",
"revision": 0
},
{
"source": "hackage",
"package": "splitmix",
"version": "0.1.0.3",
"flags": [
"-optimised-mixer"
],
"cabal_sha256": "fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c",
"src_sha256": "46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35",
"revision": 0
},
{
"source": "hackage",
"package": "random",
"version": "1.2.0",
"flags": [],
"cabal_sha256": "30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9",
"src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
"revision": 5
},
{
"source": "hackage",
"package": "edit-distance",
"version": "0.2.2.1",
"flags": [],
"cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
"src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
"revision": 1
},
{
"source": "hackage",
"package": "exceptions",
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/linux-8.6.5.plan.json
View file

Large diffs are not rendered by default.

79 changes: 40 additions & 39 deletions bootstrap/linux-8.8.4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
{
"source": "hackage",
"package": "network",
"version": "3.1.2.1",
"version": "3.1.2.2",
"flags": [
"-devel"
],
"cabal_sha256": "188d6daea8cd91bc3553efd5a90a1e7c6d0425fa66a53baa74db5b6d9fd75c8b",
"src_sha256": "fcaa954445cb575ff04d088e719452e356324b6acb98c5aefd2541a069439d4a",
"revision": 1
"cabal_sha256": "218e2968e03d99c40f32a2ef7cc41a848969096ba1c780ff2e57997a00246b06",
"src_sha256": "55012c0b22f9c7548b1f7b3bacc2c6ec7058c7f92238a69561528f1a0fa60eb6",
"revision": 0
},
{
"source": "hackage",
Expand Down Expand Up @@ -58,12 +58,13 @@
{
"source": "hackage",
"package": "hashable",
"version": "1.3.1.0",
"version": "1.3.2.0",
"flags": [
"+integer-gmp"
"+integer-gmp",
"-random-initial-seed"
],
"cabal_sha256": "d965e098e06cc585b201da6137dcb31c40f35eb7a937b833903969447985c076",
"src_sha256": "8061823a4ac521b53912edcba36b956f3159cb885b07ec119af295a6568ca7c4",
"cabal_sha256": "02bc544e3546713b1d76a3c5bfc836a5fd19a5b4348ef4a52bb973d0c35a4b89",
"src_sha256": "59bd964b6fe52b04825cf5402c87981068c051f351b2cb940b75f1c60719d637",
"revision": 0
},
{
Expand Down Expand Up @@ -95,6 +96,35 @@
"src_sha256": "af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638",
"revision": 0
},
{
"source": "hackage",
"package": "splitmix",
"version": "0.1.0.3",
"flags": [
"-optimised-mixer"
],
"cabal_sha256": "fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c",
"src_sha256": "46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35",
"revision": 0
},
{
"source": "hackage",
"package": "random",
"version": "1.2.0",
"flags": [],
"cabal_sha256": "30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9",
"src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
"revision": 5
},
{
"source": "hackage",
"package": "edit-distance",
"version": "0.2.2.1",
"flags": [],
"cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
"src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
"revision": 1
},
{
"source": "local",
"package": "cabal-install-solver",
Expand All @@ -116,9 +146,9 @@
"-exe",
"+use-cbits"
],
"cabal_sha256": "daa34001f8221bf550a3afb278ee9ac3a7257dba187cd7ec4bd5436264b26424",
"cabal_sha256": "797a0af7b8a0e654cbddd3df6b9de02d2cbfcb2292cf001399ab53910fbbb76c",
"src_sha256": "8ad6e9875a9128f6cd66d65d80f9f85dd0559c73ac00bb37f71fbee820d10519",
"revision": 0
"revision": 1
},
{
"source": "hackage",
Expand All @@ -131,35 +161,6 @@
"src_sha256": "c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43",
"revision": 0
},
{
"source": "hackage",
"package": "splitmix",
"version": "0.1.0.3",
"flags": [
"-optimised-mixer"
],
"cabal_sha256": "fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c",
"src_sha256": "46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35",
"revision": 0
},
{
"source": "hackage",
"package": "random",
"version": "1.2.0",
"flags": [],
"cabal_sha256": "30d72df4cc1d2fe2d445c88f0ee9d21965af7ce86660c43a6c32a6a1d90d51c9",
"src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de",
"revision": 5
},
{
"source": "hackage",
"package": "edit-distance",
"version": "0.2.2.1",
"flags": [],
"cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee",
"src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
"revision": 1
},
{
"source": "hackage",
"package": "exceptions",
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/linux-8.8.4.plan.json
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 3c4023f

Please sign in to comment.