[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 3 commits: Remove mention of make from README.md

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
d83a92e6 by sheaf at 2022-10-07T07:36:30-04:00
Remove mention of make from README.md

- - - - -
dccbfbf8 by Bodigrim at 2022-10-10T14:53:23-04:00
Add a newline before since pragma in Data.Array.Byte

- - - - -
e08165be by Vladislav Zavialov at 2022-10-10T14:53:24-04:00
Parser/PostProcess: rename failOp* functions

There are three functions named failOp* in the parser:
	failOpNotEnabledImportQualifiedPost
	failOpImportQualifiedTwice
	failOpFewArgs
Only the last one has anything to do with operators. The other two
were named this way either by mistake or due to a misunderstanding of
what "op" stands for. This small patch corrects this.

- - - - -


3 changed files:

- README.md
- compiler/GHC/Parser/PostProcess.hs
- libraries/base/Data/Array/Byte.hs


Changes:

=====================================
README.md
=====================================
@@ -53,19 +53,22 @@ For building library documentation, you'll need [Haddock][6].  To build
 the compiler documentation, you need [Sphinx](http://www.sphinx-doc.org/)
 and Xelatex (only for PDF output).
 
-**Quick start**: the following gives you a default build:
+**Quick start**: GHC is built using the [Hadrian build system](hadrian/README.md).
+The following gives you a default build:
 
     $ ./boot
     $ ./configure
-    $ make         # can also say 'make -jX' for X number of jobs
-    $ make install
+    $ hadrian/build         # can also say '-jX' for X number of jobs
 
   On Windows, you need an extra repository containing some build tools.
   These can be downloaded for you by configure. This only needs to be done once by running:
 
     $ ./configure --enable-tarballs-autodownload
 
-(NB: **Do you have multiple cores? Be sure to tell that to `make`!** This can
+  Additionally, on Windows, to run Hadrian you should run `hadrian/build.bat`
+  instead of `hadrian/build`.
+
+(NB: **Do you have multiple cores? Be sure to tell that to `hadrian`!** This can
 save you hours of build time depending on your system configuration, and is
 almost always a win regardless of how many cores you have. As a simple rule,
 you should have about N+1 jobs, where `N` is the amount of cores you have.)


=====================================
compiler/GHC/Parser/PostProcess.hs
=====================================
@@ -96,8 +96,8 @@ module GHC.Parser.PostProcess (
         warnStarIsType,
         warnPrepositiveQualifiedModule,
         failOpFewArgs,
-        failOpNotEnabledImportQualifiedPost,
-        failOpImportQualifiedTwice,
+        failNotEnabledImportQualifiedPost,
+        failImportQualifiedTwice,
 
         SumOrTuple (..),
 
@@ -1133,13 +1133,13 @@ checkImportDecl mPre mPost = do
   -- 'ImportQualifiedPost' is not in effect.
   whenJust mPost $ \post ->
     when (not importQualifiedPostEnabled) $
-      failOpNotEnabledImportQualifiedPost (RealSrcSpan (epaLocationRealSrcSpan post) Strict.Nothing)
+      failNotEnabledImportQualifiedPost (RealSrcSpan (epaLocationRealSrcSpan post) Strict.Nothing)
 
   -- Error if 'qualified' occurs in both pre and postpositive
   -- positions.
   whenJust mPost $ \post ->
     when (isJust mPre) $
-      failOpImportQualifiedTwice (RealSrcSpan (epaLocationRealSrcSpan post) Strict.Nothing)
+      failImportQualifiedTwice (RealSrcSpan (epaLocationRealSrcSpan post) Strict.Nothing)
 
   -- Warn if 'qualified' found in prepositive position and
   -- 'Opt_WarnPrepositiveQualifiedModule' is enabled.
@@ -2873,12 +2873,12 @@ warnPrepositiveQualifiedModule :: SrcSpan -> P ()
 warnPrepositiveQualifiedModule span =
   addPsMessage span PsWarnImportPreQualified
 
-failOpNotEnabledImportQualifiedPost :: SrcSpan -> P ()
-failOpNotEnabledImportQualifiedPost loc =
+failNotEnabledImportQualifiedPost :: SrcSpan -> P ()
+failNotEnabledImportQualifiedPost loc =
   addError $ mkPlainErrorMsgEnvelope loc $ PsErrImportPostQualified
 
-failOpImportQualifiedTwice :: SrcSpan -> P ()
-failOpImportQualifiedTwice loc =
+failImportQualifiedTwice :: SrcSpan -> P ()
+failImportQualifiedTwice loc =
   addError $ mkPlainErrorMsgEnvelope loc $ PsErrImportQualifiedTwice
 
 warnStarIsType :: SrcSpan -> P ()


=====================================
libraries/base/Data/Array/Byte.hs
=====================================
@@ -205,6 +205,7 @@ instance Eq (MutableByteArray s) where
 -- | Non-lexicographic ordering. This compares the lengths of
 -- the byte arrays first and uses a lexicographic ordering if
 -- the lengths are equal. Subject to change between major versions.
+--
 -- @since 4.17.0.0
 instance Ord ByteArray where
   ba1@(ByteArray ba1#) `compare` ba2@(ByteArray ba2#)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/29ea16516cd914e7d2941763b0e533b8aa6e04d6...e08165be99a93eeed2cff1c71c7dbe48d96db0f1

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/29ea16516cd914e7d2941763b0e533b8aa6e04d6...e08165be99a93eeed2cff1c71c7dbe48d96db0f1
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/20221010/522b8ddf/attachment-0001.html>