Skip to content

Commit

Permalink
Registered the NamedDefaults language extension (#9740)
Browse files Browse the repository at this point in the history
* Registered the NamedDefaults language extension

* Added changelog and Vim configuration lines

* Updated the expected hashes

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 00835c0)

# Conflicts:
#	Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
  • Loading branch information
blamario authored and mergify[bot] committed Sep 12, 2024
1 parent 7ee3d54 commit 1c89d34
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
16 changes: 16 additions & 0 deletions Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,24 @@ md5Check proxy md5Int = structureHash proxy @?= md5FromInteger md5Int

md5CheckGenericPackageDescription :: Proxy GenericPackageDescription -> Assertion
md5CheckGenericPackageDescription proxy = md5Check proxy
<<<<<<< HEAD

Check failure on line 33 in Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs

View workflow job for this annotation

GitHub Actions / hlint

Error: Parse error: on input `<<<<<<<' ▫︎ Found: " md5CheckGenericPackageDescription :: Proxy GenericPackageDescription -> Assertion\n md5CheckGenericPackageDescription proxy = md5Check proxy\n> <<<<<<< HEAD\n 0xe40d8d67b85712f245354657d7a80165\n"

Check failure on line 33 in Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs

View workflow job for this annotation

GitHub Actions / hlint

Error: Parse error: on input `<<<<<<<' ▫︎ Found: " md5CheckGenericPackageDescription :: Proxy GenericPackageDescription -> Assertion\n md5CheckGenericPackageDescription proxy = md5Check proxy\n> <<<<<<< HEAD\n 0xe40d8d67b85712f245354657d7a80165\n"
0xe40d8d67b85712f245354657d7a80165

md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion
md5CheckLocalBuildInfo proxy = md5Check proxy
0x94827844fdb1afedee525061749fb16f
=======
#if MIN_VERSION_base(4,19,0)
0x6639f65b143830a97e9c4f448b9cabb0
#else
0x855933700dccfbcc1d642e3470c3702c
#endif

md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion
md5CheckLocalBuildInfo proxy = md5Check proxy
#if MIN_VERSION_base(4,19,0)
0x2ae73730f60c7c947e2cb63c4aac1e54
#else
0x906cbfdef0bcdfe5734499cfabc615f5
#endif
>>>>>>> 00835c075 (Registered the NamedDefaults language extension (#9740))
9 changes: 9 additions & 0 deletions changelog.d/pr-9740
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
synopsis: Add language extension NamedDefaults
packages: Cabal-syntax
prs: #9740

description: {

- adds support for the `NamedDefaults` language extension (GHC proposal #409)

}

0 comments on commit 1c89d34

Please sign in to comment.