[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 3 commits: hadrian: track python dependencies in doc rules

[Marge Bot (@marge-bot)]

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


Commits:
e6f28938 by Zubin Duggal at 2023-09-04T20:37:29-04:00
hadrian: track python dependencies in doc rules

- - - - -
90768757 by sheaf at 2023-09-04T20:37:36-04:00
Bump Haddock to fix #23616

This commit updates the Haddock submodule to include
the fix to #23616.

Fixes #23616

- - - - -
4c5c8d41 by David Binder at 2023-09-04T20:37:38-04:00
Fix example in GHC user guide in SafeHaskell section

The example given in the SafeHaskell section uses an implementation of
Monad which no longer works. This MR removes the non-canonical return
instance and adds the necessary instances of Functor and Applicative.

- - - - -


3 changed files:

- docs/users_guide/exts/safe_haskell.rst
- hadrian/src/Rules/Documentation.hs
- utils/haddock


Changes:

=====================================
docs/users_guide/exts/safe_haskell.rst
=====================================
@@ -109,8 +109,14 @@ define the plugin interface so that it requires the plugin module,
     -- Notice that symbol UnsafeRIO is not exported from this module!
     newtype RIO a = UnsafeRIO { runRIO :: IO a }
 
+    instance Functor RIO where
+        fmap f (UnsafeRIO m) = UnsafeRIO (fmap f m)
+
+    instance Applicative RIO where
+        pure = UnsafeRIO . pure
+        (UnsafeRIO f) <*> (UnsafeRIO m) = UnsafeRIO (f <*> m)
+
     instance Monad RIO where
-        return = UnsafeRIO . return
         (UnsafeRIO m) >>= k = UnsafeRIO $ m >>= runRIO . k
 
     -- Returns True iff access is allowed to file name


=====================================
hadrian/src/Rules/Documentation.hs
=====================================
@@ -82,6 +82,15 @@ needDocDeps = do
             ]
 
     need templatedCabalFiles
+    need [ "docs" -/- "users_guide" -/- file
+         | file <- [ "conf.py"
+                   , "flags.py"
+                   , "ghc_config.py"
+                   , "ghc_packages.py"
+                   , "utils.py"
+                   ]
+         ]
+
 
 -- | Build all documentation
 documentationRules :: Rules ()


=====================================
utils/haddock
=====================================
@@ -1 +1 @@
-Subproject commit 5877bcebce88afad40ae9decb0f6029681c51848
+Subproject commit 394920426d99cee7822d5854bc83bbaab4970c7a



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9c0ec045edec78fa819a8d5a9f9f6be7e2e89650...4c5c8d41b6445fa952120a891acaa30ce926cdb4

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9c0ec045edec78fa819a8d5a9f9f6be7e2e89650...4c5c8d41b6445fa952120a891acaa30ce926cdb4
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/20230904/1498b0d6/attachment-0001.html>