[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 3 commits: chore: extend `.editorconfig` for C files

[Marge Bot (@marge-bot)]

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


Commits:
01e0f444 by Nicolas Trangez at 2022-10-04T17:54:01-04:00
chore: extend `.editorconfig` for C files

- - - - -
35f741ce by Brandon Chinn at 2022-10-04T17:54:02-04:00
Fix docs for pattern synonyms
- - - - -
098f3df7 by Oleg Grenrus at 2022-10-04T17:54:04-04:00
Use sameByteArray# in sameByteArray

- - - - -


3 changed files:

- .editorconfig
- docs/users_guide/exts/pattern_synonyms.rst
- libraries/base/Data/Array/Byte.hs


Changes:

=====================================
.editorconfig
=====================================
@@ -12,3 +12,7 @@ end_of_line = lf
 
 [Makefile]
 indent_style = tab
+
+[*.c]
+indent_style = space
+indent_size = 2


=====================================
docs/users_guide/exts/pattern_synonyms.rst
=====================================
@@ -524,9 +524,9 @@ Pragmas for pattern synonyms
 ----------------------------
 
 The :ref:`inlinable-pragma`, :ref:`inline-pragma` and :ref:`noinline-pragma` are supported for pattern
-synonyms. For example: ::
+synonyms as of GHC 9.2. For example: ::
 
-    patternInlinablePattern x = [x]
+    pattern InlinablePattern x = [x]
     {-# INLINABLE InlinablePattern #-}
     pattern InlinedPattern x = [x]
     {-# INLINE InlinedPattern #-}


=====================================
libraries/base/Data/Array/Byte.hs
=====================================
@@ -185,8 +185,7 @@ compareByteArraysFromBeginning (ByteArray ba1#) (ByteArray ba2#) (I# n#)
 -- | Do two byte arrays share the same pointer?
 sameByteArray :: ByteArray# -> ByteArray# -> Bool
 sameByteArray ba1 ba2 =
-    case reallyUnsafePtrEquality# (unsafeCoerce# ba1 :: ()) (unsafeCoerce# ba2 :: ()) of
-      r -> isTrue# r
+    case sameByteArray# ba1 ba2 of r -> isTrue# r
 
 -- | @since 4.17.0.0
 instance Eq ByteArray where



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/17019caacfddc5a9f56846cfaa6c8e0bc6c1cc52...098f3df749200dd96f8c7be098ff9a839633a2bf

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/17019caacfddc5a9f56846cfaa6c8e0bc6c1cc52...098f3df749200dd96f8c7be098ff9a839633a2bf
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/20221004/22fdeb22/attachment-0001.html>