[Git][ghc/ghc][wip/ghc-8.10-backports] 2 commits: Fix typos in 8.10.2 changelog
Ben Gamari
gitlab at gitlab.haskell.org
Sun Nov 1 02:31:41 UTC 2020
Ben Gamari pushed to branch wip/ghc-8.10-backports at Glasgow Haskell Compiler / GHC
Commits:
929e09ed by toonn at 2020-10-22T22:12:43-04:00
Fix typos in 8.10.2 changelog
Replace an "as well" missing "as" with "and" in 4.1 Highlights.
Add missing apostrophe in "user's guide", insert space in "work around"
and dash in "cost-center" in 4.2.2 Runtime system.
- - - - -
cc085aef by Ben Gamari at 2020-10-31T22:31:33-04:00
Bump Cabal submodule to 3.2.1.0
- - - - -
16 changed files:
- docs/users_guide/8.10.2-notes.rst
- libraries/Cabal
- libraries/ghc-prim/ghc-prim.cabal
- testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal
- testsuite/tests/backpack/cabal/bkpcabal01/bkpcabal01.cabal
- testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.cabal
- testsuite/tests/backpack/cabal/bkpcabal03/asig1/asig1.cabal
- testsuite/tests/backpack/cabal/bkpcabal03/asig2/asig2.cabal
- testsuite/tests/backpack/cabal/bkpcabal03/bkpcabal03.cabal.in1
- testsuite/tests/backpack/cabal/bkpcabal03/bkpcabal03.cabal.in2
- testsuite/tests/backpack/cabal/bkpcabal04/bkpcabal04.cabal.in1
- testsuite/tests/backpack/cabal/bkpcabal04/bkpcabal04.cabal.in2
- testsuite/tests/backpack/cabal/bkpcabal05/bkpcabal05.cabal
- testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.cabal
- testsuite/tests/backpack/cabal/bkpcabal07/bkpcabal07.cabal
- testsuite/tests/cabal/cabal01/test.cabal
Changes:
=====================================
docs/users_guide/8.10.2-notes.rst
=====================================
@@ -22,7 +22,7 @@ Highlights
(:ghc-ticket:`18033`).
- Fixes a few specialiser regressions (:ghc-ticket:`17810`,
- :ghc-ticket:`18120`) as well introduces a variety of miscellaneous
+ :ghc-ticket:`18120`) and introduces a variety of miscellaneous
specialiser improvements (:ghc-ticket:`16473`, :ghc-ticket:`17930`,
:ghc-ticket:`17966`)
@@ -48,7 +48,7 @@ Runtime system
effect of :rts-flag:`--nonmoving-gc`.
- The RTS now allows the user to specify a minimum time between idle GCs with
- the :rts-flag:`-Iw ⟨seconds⟩` flag. 8.10.1 contained a users guide reference
+ the :rts-flag:`-Iw ⟨seconds⟩` flag. 8.10.1 contained a user's guide reference
to this flag but did not include the associated implementation.
- A memory leak in the cost-center profiler has been fixed
@@ -57,10 +57,10 @@ Runtime system
- A potential integer overflow in the compact normal form import logic has
been fixed (:ghc-ticket:`16992`)
- - We now workaround a Linux kernel bug in the implementation of timerfd which
+ - We now work around a Linux kernel bug in the implementation of timerfd which
could previously result in program crashes (:ghc-ticket:`18033`)
- - The cost center profiler's JSON output backend now escapes backslashes
+ - The cost-center profiler's JSON output backend now escapes backslashes
correctly (:ghc-ticket:`18438`)
- A variety of linker issues on ARM platforms have been fixed.
=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit df65caf90ff79894dacecf73a642452aaabcc0a5
+Subproject commit 48bf10787e27364730dd37a42b603cee8d6af7ee
=====================================
libraries/ghc-prim/ghc-prim.cabal
=====================================
@@ -1,4 +1,4 @@
-cabal-version: 2.1
+cabal-version: 2.2
name: ghc-prim
version: 0.6.1
-- NOTE: Don't forget to update ./changelog.md
=====================================
testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal
=====================================
@@ -1,8 +1,9 @@
+cabal-version: 2.2
name: backpack-issue
version: 0.1.0.0
-- synopsis:
-- description:
-license: BSD3
+license: BSD-3-Clause
license-file: LICENSE
author: Isaac Elliott
maintainer: isaace71295 at gmail.com
@@ -10,7 +11,6 @@ maintainer: isaace71295 at gmail.com
-- category:
build-type: Simple
extra-source-files: CHANGELOG.md
-cabal-version: >=2
library library-a
signatures: A.Sig
=====================================
testsuite/tests/backpack/cabal/bkpcabal01/bkpcabal01.cabal
=====================================
@@ -1,10 +1,10 @@
+cabal-version: 2.2
name: bkpcabal01
version: 0.1.0.0
-license: BSD3
+license: BSD-3-Clause
author: Edward Z. Yang
maintainer: ezyang at cs.stanford.edu
build-type: Simple
-cabal-version: >=1.25
library impl
exposed-modules: H, I
=====================================
testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.cabal
=====================================
@@ -1,10 +1,10 @@
+cabal-version: 2.2
name: bkpcabal01
version: 0.1.0.0
-license: BSD3
+license: BSD-3-Clause
author: Edward Z. Yang
maintainer: ezyang at cs.stanford.edu
build-type: Simple
-cabal-version: >=1.25
library p
signatures: H
=====================================
testsuite/tests/backpack/cabal/bkpcabal03/asig1/asig1.cabal
=====================================
@@ -1,10 +1,10 @@
+cabal-version: 2.2
name: asig1
version: 0.1.0.0
-license: BSD3
+license: BSD-3-Clause
author: Edward Z. Yang
maintainer: ezyang at cs.stanford.edu
build-type: Simple
-cabal-version: >=1.25
library
build-depends: base
=====================================
testsuite/tests/backpack/cabal/bkpcabal03/asig2/asig2.cabal
=====================================
@@ -1,10 +1,10 @@
+cabal-version: 2.2
name: asig2
version: 0.1.0.0
-license: BSD3
+license: BSD-3-Clause
author: Edward Z. Yang
maintainer: ezyang at cs.stanford.edu
build-type: Simple
-cabal-version: >=1.25
library
build-depends: base
=====================================
testsuite/tests/backpack/cabal/bkpcabal03/bkpcabal03.cabal.in1
=====================================
@@ -1,10 +1,10 @@
+cabal-version: 2.2
name: bkpcabal03
version: 0.1.0.0
-license: BSD3
+license: BSD-3-Clause
author: Edward Z. Yang
maintainer: ezyang at cs.stanford.edu
build-type: Simple
-cabal-version: >=1.25
library
build-depends: asig1, base
=====================================
testsuite/tests/backpack/cabal/bkpcabal03/bkpcabal03.cabal.in2
=====================================
@@ -1,10 +1,10 @@
+cabal-version: 2.2
name: bkpcabal03
version: 0.1.0.0
-license: BSD3
+license: BSD-3-Clause
author: Edward Z. Yang
maintainer: ezyang at cs.stanford.edu
build-type: Simple
-cabal-version: >=1.25
library
build-depends: asig1, asig2, base
=====================================
testsuite/tests/backpack/cabal/bkpcabal04/bkpcabal04.cabal.in1
=====================================
@@ -1,10 +1,10 @@
+cabal-version: 2.2
name: bkpcabal04
version: 0.1.0.0
-license: BSD3
+license: BSD-3-Clause
author: Edward Z. Yang
maintainer: ezyang at cs.stanford.edu
build-type: Simple
-cabal-version: >=1.25
library p
signatures: A
=====================================
testsuite/tests/backpack/cabal/bkpcabal04/bkpcabal04.cabal.in2
=====================================
@@ -1,10 +1,10 @@
+cabal-version: 2.2
name: bkpcabal04
version: 0.1.0.0
-license: BSD3
+license: BSD-3-Clause
author: Edward Z. Yang
maintainer: ezyang at cs.stanford.edu
build-type: Simple
-cabal-version: >=1.25
library p
signatures: A
=====================================
testsuite/tests/backpack/cabal/bkpcabal05/bkpcabal05.cabal
=====================================
@@ -1,10 +1,10 @@
+cabal-version: 2.2
name: bkpcabal05
version: 0.1.0.0
-license: BSD3
+license: BSD-3-Clause
author: Edward Z. Yang
maintainer: ezyang at cs.stanford.edu
build-type: Simple
-cabal-version: >=1.25
library
signatures: A
=====================================
testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.cabal
=====================================
@@ -1,10 +1,10 @@
+cabal-version: 2.2
name: bkpcabal06
version: 0.1.0.0
-license: BSD3
+license: BSD-3-Clause
author: Edward Z. Yang
maintainer: ezyang at cs.stanford.edu
build-type: Simple
-cabal-version: 2.0
library sig
signatures: P
=====================================
testsuite/tests/backpack/cabal/bkpcabal07/bkpcabal07.cabal
=====================================
@@ -1,10 +1,10 @@
+cabal-version: 2.2
name: bkpcabal06
version: 0.1.0.0
-license: BSD3
+license: BSD-3-Clause
author: Edward Z. Yang
maintainer: ezyang at cs.stanford.edu
build-type: Simple
-cabal-version: >=2.0
library indef
signatures: P
=====================================
testsuite/tests/cabal/cabal01/test.cabal
=====================================
@@ -1,3 +1,4 @@
+Cabal-Version: 2.2
Name: test
Version: 1.0
Exposed-Modules: A
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ddea40611cf3fb7d6ec50c817e6ddd209427428b...cc085aefd9d72da6aff5c5305a6b864398f95ec3
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ddea40611cf3fb7d6ec50c817e6ddd209427428b...cc085aefd9d72da6aff5c5305a6b864398f95ec3
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20201031/1238426d/attachment-0001.html>
More information about the ghc-commits
mailing list