From 5c239c75e02db366a95f2f2fe85b4feefb6a6942 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 17 Oct 2022 16:58:39 -0500 Subject: [PATCH 1/3] Regenerate changelog --- CHANGELOG.d/fix_4400.md | 1 - .../fix_make-fromjson-backwards-compatible.md | 12 ------------ CHANGELOG.md | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+), 13 deletions(-) delete mode 100644 CHANGELOG.d/fix_4400.md delete mode 100644 CHANGELOG.d/fix_make-fromjson-backwards-compatible.md diff --git a/CHANGELOG.d/fix_4400.md b/CHANGELOG.d/fix_4400.md deleted file mode 100644 index f4c682de88..0000000000 --- a/CHANGELOG.d/fix_4400.md +++ /dev/null @@ -1 +0,0 @@ -* Fix extraneous qualifiers added to references to floated expressions diff --git a/CHANGELOG.d/fix_make-fromjson-backwards-compatible.md b/CHANGELOG.d/fix_make-fromjson-backwards-compatible.md deleted file mode 100644 index a4baf4f540..0000000000 --- a/CHANGELOG.d/fix_make-fromjson-backwards-compatible.md +++ /dev/null @@ -1,12 +0,0 @@ -* Make `FromJSON` instance for `Qualified` backwards compatible - - Prior to #4293, `Qualified` was encoded to JSON such that - - ```haskell - >>> encode $ Qualified Nothing "foo" - [null,"foo"] - >>> encode $ Qualified (Just $ ModuleName "A") "bar" - ["A","bar"] - ``` - - The type of `Qualified` has changed so that `null` no longer appears in JSON output, but for sake of backwards-compatibility with JSON that was produced prior to those changes (pre-`v0.15.2`), we need to accept `null`, which will be interpreted as `Qualified ByNullSourcePos`. diff --git a/CHANGELOG.md b/CHANGELOG.md index 987299a1d6..f3dbe6af11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,25 @@ Notable changes to this project are documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 0.15.6 + +Bugfixes: + +* Make `FromJSON` instance for `Qualified` backwards compatible (#4403 by @ptrfrncsmrph) + + Prior to #4293, `Qualified` was encoded to JSON such that + + ```haskell + >>> encode $ Qualified Nothing "foo" + [null,"foo"] + >>> encode $ Qualified (Just $ ModuleName "A") "bar" + ["A","bar"] + ``` + + The type of `Qualified` has changed so that `null` no longer appears in JSON output, but for sake of backwards-compatibility with JSON that was produced prior to those changes (pre-`v0.15.2`), we need to accept `null`, which will be interpreted as `Qualified ByNullSourcePos`. + +* Fix extraneous qualifiers added to references to floated expressions (#4401 by @rhendric) + ## 0.15.5 New features: From 4e87dd473cdc18abfa410939fcd41cf08e8f3c57 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 17 Oct 2022 16:58:48 -0500 Subject: [PATCH 2/3] Update version to 0.15.6 --- npm-package/package.json | 6 +++--- purescript.cabal | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/npm-package/package.json b/npm-package/package.json index 921bc13790..4c56c78f57 100644 --- a/npm-package/package.json +++ b/npm-package/package.json @@ -1,6 +1,6 @@ { "name": "purescript", - "version": "0.15.5", + "version": "0.15.6", "license": "ISC", "description": "PureScript wrapper that makes it available as a local dependency", "author": { @@ -43,7 +43,7 @@ ], "scripts": { "prepublishOnly": "node -e \"require('fs').copyFileSync('purs.bin.placeholder', 'purs.bin');\"", - "postinstall": "install-purescript --purs-ver=0.15.5", + "postinstall": "install-purescript --purs-ver=0.15.6", "test": "echo 'Error: no test specified' && exit 1" } -} +} \ No newline at end of file diff --git a/purescript.cabal b/purescript.cabal index bcbdc62ebf..84458234c4 100644 --- a/purescript.cabal +++ b/purescript.cabal @@ -2,7 +2,7 @@ cabal-version: 2.4 name: purescript -- Note: don't add prerelease identifiers here! Add them in app/Version.hs and npm-package/package.json instead. -version: 0.15.5 +version: 0.15.6 synopsis: PureScript Programming Language Compiler description: A small strongly, statically typed programming language with expressive types, inspired by Haskell and compiling to JavaScript. category: Language From f2877823f8eb9160fdf5eb37bff0716034778011 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 17 Oct 2022 16:59:42 -0500 Subject: [PATCH 3/3] Fix whitespace issue --- npm-package/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm-package/package.json b/npm-package/package.json index 4c56c78f57..490202617a 100644 --- a/npm-package/package.json +++ b/npm-package/package.json @@ -46,4 +46,4 @@ "postinstall": "install-purescript --purs-ver=0.15.6", "test": "echo 'Error: no test specified' && exit 1" } -} \ No newline at end of file +}