[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: Fix typo in 8.8.1 notes related to traceBinaryEvent

[Marge Bot]

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


Commits:
ac2fe536 by iustin at 2019-05-04T16:04:12Z
Fix typo in 8.8.1 notes related to traceBinaryEvent

- fixes double mention of `traceBinaryEvent#` (the second one should be `traceEvent#`, I think)
- fixes note about `traceEvent#` taking a `String` - the docs say it takes a zero-terminated ByteString.
- - - - -
99a56178 by gallais at 2019-05-04T16:04:12Z
[ typo ] 'castFloatToWord32' -> 'castFloatToWord64'

Probably due to a copy/paste gone wrong.
- - - - -


2 changed files:

- docs/users_guide/8.8.1-notes.rst
- libraries/base/GHC/Float.hs


Changes:

=====================================
docs/users_guide/8.8.1-notes.rst
=====================================
@@ -149,8 +149,9 @@ Template Haskell
 ~~~~~~~~~~~~~~~~~~~~
 
 - GHC now exposes a new primop, ``traceBinaryEvent#``. This primop writes
-  eventlog events similar to ``traceBinaryEvent#`` but allows the user to pass
-  the event payload as a binary blob instead of a ``String``.
+  eventlog events similar to ``traceEvent#`` but allows the user to pass
+  the event payload as a binary blob instead of a zero-terminated
+  ``ByteString``.
 
 - The ``StableName#`` type parameter now has a phantom role instead of
   a representational one. There is really no reason to care about the


=====================================
libraries/base/GHC/Float.hs
=====================================
@@ -1387,7 +1387,7 @@ foreign import prim "stg_word64ToDoublezh"
 #endif
 
 
--- | @'castFloatToWord32' f@ does a bit-for-bit copy from a floating-point value
+-- | @'castFloatToWord64' f@ does a bit-for-bit copy from a floating-point value
 -- to an integral value.
 --
 -- @since 4.10.0.0



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/897d8689ed7566ae0a0ae22cddedf5bb14734dec...99a5617810945dc77c6cb393bf0418eeef5e3966

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/897d8689ed7566ae0a0ae22cddedf5bb14734dec...99a5617810945dc77c6cb393bf0418eeef5e3966
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/20190504/96cf25ac/attachment.html>