[Git][ghc/ghc][wip/bump-containers] Bump containers submodule to v0.6.1.1+
Ben Gamari
gitlab at gitlab.haskell.org
Sun Jun 16 15:53:04 UTC 2019
Ben Gamari pushed to branch wip/bump-containers at Glasgow Haskell Compiler / GHC
Commits:
d2bc5e22 by Ben Gamari at 2019-06-16T15:52:55Z
Bump containers submodule to v0.6.1.1+
- - - - -
10 changed files:
- boot
- docs/users_guide/8.10.1-notes.rst
- docs/users_guide/8.6.1-notes.rst
- docs/users_guide/8.8.1-notes.rst
- ghc.mk
- hadrian/src/Packages.hs
- libraries/containers
- testsuite/tests/backpack/should_run/bkprun05.bkp
- testsuite/tests/backpack/should_run/bkprun05.stderr
- testsuite/tests/driver/T10970.stdout
Changes:
=====================================
boot
=====================================
@@ -16,6 +16,11 @@ parser.add_argument('--validate', action='store_true', help='Run in validate mod
parser.add_argument('--hadrian', action='store_true', help='Do not assume the make base build system')
args = parser.parse_args()
+# Packages whose libraries aren't in the submodule root
+EXCEPTIONS = {
+ 'libraries/containers/': 'libraries/containers/containers/'
+}
+
def print_err(s):
print(dedent(s), file=sys.stderr)
@@ -78,7 +83,7 @@ def check_boot_packages():
# but in an lndir tree we avoid making .git directories,
# so it doesn't exist. We therefore require that every repo
# has a LICENSE file instead.
- license_path = os.path.join(dir_, 'LICENSE')
+ license_path = os.path.join(EXCEPTIONS.get(dir_+'/', dir_), 'LICENSE')
if not os.path.isfile(license_path):
die("""\
Error: %s doesn't exist
@@ -91,9 +96,12 @@ def boot_pkgs():
for package in glob.glob("libraries/*/"):
packages_file = os.path.join(package, 'ghc-packages')
+ print(package)
if os.path.isfile(packages_file):
for subpkg in open(packages_file, 'r'):
library_dirs.append(os.path.join(package, subpkg.strip()))
+ elif package in EXCEPTIONS:
+ library_dirs.append(EXCEPTIONS[package])
else:
library_dirs.append(package)
=====================================
docs/users_guide/8.10.1-notes.rst
=====================================
@@ -157,7 +157,7 @@ for further change information.
libraries/binary/binary.cabal: Dependency of ``ghc`` library
libraries/bytestring/bytestring.cabal: Dependency of ``ghc`` library
libraries/Cabal/Cabal/Cabal.cabal: Dependency of ``ghc-pkg`` utility
- libraries/containers/containers.cabal: Dependency of ``ghc`` library
+ libraries/containers/containers/containers.cabal: Dependency of ``ghc`` library
libraries/deepseq/deepseq.cabal: Dependency of ``ghc`` library
libraries/directory/directory.cabal: Dependency of ``ghc`` library
libraries/filepath/filepath.cabal: Dependency of ``ghc`` library
=====================================
docs/users_guide/8.6.1-notes.rst
=====================================
@@ -268,7 +268,7 @@ for further change information.
libraries/binary/binary.cabal: Dependency of ``ghc`` library
libraries/bytestring/bytestring.cabal: Dependency of ``ghc`` library
libraries/Cabal/Cabal/Cabal.cabal: Dependency of ``ghc-pkg`` utility
- libraries/containers/containers.cabal: Dependency of ``ghc`` library
+ libraries/containers/containers/containers.cabal: Dependency of ``ghc`` library
libraries/deepseq/deepseq.cabal: Dependency of ``ghc`` library
libraries/directory/directory.cabal: Dependency of ``ghc`` library
libraries/filepath/filepath.cabal: Dependency of ``ghc`` library
=====================================
docs/users_guide/8.8.1-notes.rst
=====================================
@@ -241,7 +241,7 @@ for further change information.
libraries/binary/binary.cabal: Dependency of ``ghc`` library
libraries/bytestring/bytestring.cabal: Dependency of ``ghc`` library
libraries/Cabal/Cabal/Cabal.cabal: Dependency of ``ghc-pkg`` utility
- libraries/containers/containers.cabal: Dependency of ``ghc`` library
+ libraries/containers/containers/containers.cabal: Dependency of ``ghc`` library
libraries/deepseq/deepseq.cabal: Dependency of ``ghc`` library
libraries/directory/directory.cabal: Dependency of ``ghc`` library
libraries/filepath/filepath.cabal: Dependency of ``ghc`` library
=====================================
ghc.mk
=====================================
@@ -426,7 +426,7 @@ PACKAGES_STAGE1 += filepath
PACKAGES_STAGE1 += array
PACKAGES_STAGE1 += deepseq
PACKAGES_STAGE1 += bytestring
-PACKAGES_STAGE1 += containers
+PACKAGES_STAGE1 += containers/containers
ifeq "$(Windows_Target)" "YES"
PACKAGES_STAGE1 += Win32
=====================================
hadrian/src/Packages.hs
=====================================
@@ -54,7 +54,7 @@ checkApiAnnotations = util "check-api-annotations"
checkPpr = util "check-ppr"
compareSizes = util "compareSizes" `setPath` "utils/compare_sizes"
compiler = top "ghc" `setPath` "compiler"
-containers = lib "containers"
+containers = lib "containers" `setPath` "libraries/containers/containers"
deepseq = lib "deepseq"
deriveConstants = util "deriveConstants"
directory = lib "directory"
=====================================
libraries/containers
=====================================
@@ -1 +1 @@
-Subproject commit 03dcb287c96613ceb1f64d5d5a82f7b94b879268
+Subproject commit 36f78a6f98ed5305ed480cacdf08dd6c1a61d506
=====================================
testsuite/tests/backpack/should_run/bkprun05.bkp
=====================================
@@ -133,7 +133,7 @@ unit app where
app = do
let x = insert 0 "foo"
. delete 1
- . insert 1 undefined
+ . insert 1 (errorWithoutStackTrace "this is an error")
. insert (6 :: Int) "foo"
$ empty
print (member 1 x)
=====================================
testsuite/tests/backpack/should_run/bkprun05.stderr
=====================================
@@ -1,4 +1,2 @@
-bkprun05: Prelude.undefined
-CallStack (from HasCallStack):
- error, called at libraries/base/GHC/Err.hs:78:14 in base:GHC.Err
- undefined, called at bkprun05.bkp:136:30 in app+app-18HBpsO5TPxCVSTvBQxSrq:App
+bkprun05: this is an error
+
=====================================
testsuite/tests/driver/T10970.stdout
=====================================
@@ -1,2 +1,2 @@
-0.6.0.1
+0.6.1.1
OK
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/d2bc5e22c285b90362a3f5ad3bc61370ca715b75
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/d2bc5e22c285b90362a3f5ad3bc61370ca715b75
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/20190616/6dc9f16a/attachment-0001.html>
More information about the ghc-commits
mailing list