Misc cleanup

- Use dedicated list functions
- Make cloneBndrs and cloneRecIdBndrs monadic
- Fix invalid haddock comments in libraries/base

5 files changed, 4 insertions, 5 deletions

diff --git a/libraries/base/GHC/Event/Manager.hs b/libraries/base/GHC/Event/Manager.hs
index 88bf450426..bdc2c3616a 100644
--- a/libraries/base/GHC/Event/Manager.hs
+++ b/libraries/base/GHC/Event/Manager.hs
@@ -467,7 +467,7 @@ onFdEvent mgr fd evs
         IT.delete (fromIntegral fd) tbl >>= maybe (return []) (selectCallbacks tbl)
     forM_ fdds $ \(FdData reg _ cb) -> cb reg evs
   where
-    -- | Here we look through the list of registrations for the fd of interest
+    -- Here we look through the list of registrations for the fd of interest
     -- and sort out which match the events that were triggered. We,
     --
     --   1. re-arm the fd as appropriate
diff --git a/libraries/base/GHC/Event/TimerManager.hs b/libraries/base/GHC/Event/TimerManager.hs
index b334924a9d..2d68f65902 100644
--- a/libraries/base/GHC/Event/TimerManager.hs
+++ b/libraries/base/GHC/Event/TimerManager.hs
@@ -175,7 +175,7 @@ step mgr = do
   state `seq` return (state == Running)
  where
 
-  -- | Call all expired timer callbacks and return the time to the
+  -- Call all expired timer callbacks and return the time to the
   -- next timeout.
   mkTimeout :: IO Timeout
   mkTimeout = do
diff --git a/libraries/base/GHC/Fingerprint.hs b/libraries/base/GHC/Fingerprint.hs
index cb5e3456c9..5b803d8a74 100644
--- a/libraries/base/GHC/Fingerprint.hs
+++ b/libraries/base/GHC/Fingerprint.hs
@@ -84,7 +84,7 @@ getFileHash path = withBinaryFile path ReadMode $ \h ->
   where
     _BUFSIZE = 4096
 
-    -- | Loop over _BUFSIZE sized chunks read from the handle,
+    -- Loop over _BUFSIZE sized chunks read from the handle,
     -- passing the callback a block of bytes and its size.
     processChunks :: Handle -> (Ptr Word8 -> Int -> IO ()) -> IO ()
     processChunks h f = allocaBytes _BUFSIZE $ \arrPtr ->
diff --git a/libraries/base/GHC/Fingerprint/Type.hs b/libraries/base/GHC/Fingerprint/Type.hs
index 234bac1d43..15e9d73983 100644
--- a/libraries/base/GHC/Fingerprint/Type.hs
+++ b/libraries/base/GHC/Fingerprint/Type.hs
@@ -30,7 +30,7 @@ data Fingerprint = Fingerprint {-# UNPACK #-} !Word64 {-# UNPACK #-} !Word64
 instance Show Fingerprint where
   show (Fingerprint w1 w2) = hex16 w1 ++ hex16 w2
     where
-      -- | Formats a 64 bit number as 16 digits hex.
+      -- Formats a 64 bit number as 16 digits hex.
       hex16 :: Word64 -> String
       hex16 i = let hex = showHex i ""
                  in replicate (16 - length hex) '0' ++ hex
diff --git a/libraries/base/GHC/IO/Encoding/Types.hs b/libraries/base/GHC/IO/Encoding/Types.hs
index 2f8ffd5e59..d0ee5a3124 100644
--- a/libraries/base/GHC/IO/Encoding/Types.hs
+++ b/libraries/base/GHC/IO/Encoding/Types.hs
@@ -119,7 +119,6 @@ data TextEncoding
 
 -- | @since 4.3.0.0
 instance Show TextEncoding where
-  -- | Returns the value of 'textEncodingName'
   show te = textEncodingName te
 
 -- | @since 4.4.0.0