diff options
author | Hécate <hecate+gitlab@glitchbra.in> | 2020-09-26 17:15:10 +0200 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-10-09 08:44:26 -0400 |
commit | f7e2fff96975128397e2dab7d57da3c9c6b8c76b (patch) | |
tree | c1aaa7d3750531a648787c075b804f242d28e589 /libraries | |
parent | e48cab2a57f2342891f985bcb44817e17e985275 (diff) | |
download | haskell-f7e2fff96975128397e2dab7d57da3c9c6b8c76b.tar.gz |
Add linting of `base` to the CI
Diffstat (limited to 'libraries')
-rw-r--r-- | libraries/base/GHC/Event/EPoll.hsc | 12 | ||||
-rw-r--r-- | libraries/base/GHC/Event/KQueue.hsc | 15 | ||||
-rw-r--r-- | libraries/base/GHC/Event/Poll.hsc | 2 | ||||
-rw-r--r-- | libraries/base/GHC/ExecutionStack/Internal.hsc | 2 | ||||
-rw-r--r-- | libraries/base/GHC/IO/Handle/Lock/LinuxOFD.hsc | 2 | ||||
-rw-r--r-- | libraries/base/GHC/IO/Handle/Lock/Windows.hsc | 2 | ||||
-rw-r--r-- | libraries/base/GHC/RTS/Flags.hsc | 3 | ||||
-rw-r--r-- | libraries/base/System/Environment/ExecutablePath.hsc | 2 | ||||
-rw-r--r-- | libraries/base/tests/Concurrent/ThreadDelay001.hs | 5 |
9 files changed, 22 insertions, 23 deletions
diff --git a/libraries/base/GHC/Event/EPoll.hsc b/libraries/base/GHC/Event/EPoll.hsc index 14324bc43d..bc3ed623d3 100644 --- a/libraries/base/GHC/Event/EPoll.hsc +++ b/libraries/base/GHC/Event/EPoll.hsc @@ -1,8 +1,7 @@ -{-# LANGUAGE Trustworthy #-} -{-# LANGUAGE GeneralizedNewtypeDeriving - , NoImplicitPrelude - , BangPatterns - #-} +{-# LANGUAGE BangPatterns #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE NoImplicitPrelude #-} +{-# LANGUAGE Trustworthy #-} ----------------------------------------------------------------------------- -- | @@ -50,8 +49,7 @@ import GHC.Base import GHC.Num (Num(..)) import GHC.Real (fromIntegral, div) import GHC.Show (Show) -import System.Posix.Internals (c_close) -import System.Posix.Internals (setCloseOnExec) +import System.Posix.Internals (c_close, setCloseOnExec) import System.Posix.Types (Fd(..)) import qualified GHC.Event.Array as A diff --git a/libraries/base/GHC/Event/KQueue.hsc b/libraries/base/GHC/Event/KQueue.hsc index 05bdd63bae..fe5ba5e221 100644 --- a/libraries/base/GHC/Event/KQueue.hsc +++ b/libraries/base/GHC/Event/KQueue.hsc @@ -1,10 +1,11 @@ -{-# LANGUAGE Trustworthy #-} -{-# LANGUAGE CApiFFI - , GeneralizedNewtypeDeriving - , NoImplicitPrelude - , RecordWildCards - , BangPatterns - #-} +{-# LANGUAGE BangPatterns #-} +{-# LANGUAGE CApiFFI #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE NoImplicitPrelude #-} +{-# LANGUAGE Trustworthy #-} + +{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-} +{-# HLINT ignore "Unused LANGUAGE pragma" #-} module GHC.Event.KQueue ( diff --git a/libraries/base/GHC/Event/Poll.hsc b/libraries/base/GHC/Event/Poll.hsc index 370dd4a365..a9d073be6a 100644 --- a/libraries/base/GHC/Event/Poll.hsc +++ b/libraries/base/GHC/Event/Poll.hsc @@ -91,7 +91,7 @@ poll p mtout f = do c_pollLoop ptr (fromIntegral len) (fromTimeout tout) Nothing -> c_poll_unsafe ptr (fromIntegral len) 0 - when (n /= 0) $ do + when (n /= 0) $ A.loop a 0 $ \i e -> do let r = pfdRevents e if r /= 0 diff --git a/libraries/base/GHC/ExecutionStack/Internal.hsc b/libraries/base/GHC/ExecutionStack/Internal.hsc index 7db1e86ff7..46deccbd73 100644 --- a/libraries/base/GHC/ExecutionStack/Internal.hsc +++ b/libraries/base/GHC/ExecutionStack/Internal.hsc @@ -171,7 +171,7 @@ stackFrames st@(StackTrace fptr) = unsafePerformIO $ withSession $ \sess -> do frame' = frame `plusPtr` sizeOf (undefined :: Addr) lookupFrame :: Addr -> IO (Maybe Location) - lookupFrame pc = withForeignPtr fptr $ const $ do + lookupFrame pc = withForeignPtr fptr $ const $ allocaBytes locationSize $ \buf -> do ret <- withForeignPtr sess $ \sessPtr -> libdw_lookup_location sessPtr buf pc case ret of diff --git a/libraries/base/GHC/IO/Handle/Lock/LinuxOFD.hsc b/libraries/base/GHC/IO/Handle/Lock/LinuxOFD.hsc index 826656c936..86d1545db8 100644 --- a/libraries/base/GHC/IO/Handle/Lock/LinuxOFD.hsc +++ b/libraries/base/GHC/IO/Handle/Lock/LinuxOFD.hsc @@ -60,7 +60,7 @@ instance Storable FLock where #{poke struct flock, l_start} ptr (l_start x) #{poke struct flock, l_len} ptr (l_len x) #{poke struct flock, l_pid} ptr (l_pid x) - peek ptr = do + peek ptr = FLock <$> #{peek struct flock, l_type} ptr <*> #{peek struct flock, l_whence} ptr <*> #{peek struct flock, l_start} ptr diff --git a/libraries/base/GHC/IO/Handle/Lock/Windows.hsc b/libraries/base/GHC/IO/Handle/Lock/Windows.hsc index f1e54125bb..399807b54b 100644 --- a/libraries/base/GHC/IO/Handle/Lock/Windows.hsc +++ b/libraries/base/GHC/IO/Handle/Lock/Windows.hsc @@ -1,7 +1,5 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE InterruptibleFFI #-} -{-# LANGUAGE LambdaCase #-} -{-# LANGUAGE MultiWayIf #-} {-# LANGUAGE NoImplicitPrelude #-} -- | File locking for Windows. diff --git a/libraries/base/GHC/RTS/Flags.hsc b/libraries/base/GHC/RTS/Flags.hsc index 03cd368723..b23ae34165 100644 --- a/libraries/base/GHC/RTS/Flags.hsc +++ b/libraries/base/GHC/RTS/Flags.hsc @@ -1,6 +1,5 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE RecordWildCards #-} -- | Accessors to GHC RTS flags. -- Descriptions of flags can be seen in @@ -392,7 +391,7 @@ data RTSFlags = RTSFlags foreign import ccall "&RtsFlags" rtsFlagsPtr :: Ptr RTSFlags getRTSFlags :: IO RTSFlags -getRTSFlags = do +getRTSFlags = RTSFlags <$> getGCFlags <*> getConcFlags <*> getMiscFlags diff --git a/libraries/base/System/Environment/ExecutablePath.hsc b/libraries/base/System/Environment/ExecutablePath.hsc index 932af67b45..59a3d624e8 100644 --- a/libraries/base/System/Environment/ExecutablePath.hsc +++ b/libraries/base/System/Environment/ExecutablePath.hsc @@ -132,7 +132,7 @@ foreign import ccall unsafe "readlink" -- See readlink(2) readSymbolicLink :: FilePath -> IO FilePath readSymbolicLink file = - allocaArray0 4096 $ \buf -> do + allocaArray0 4096 $ \buf -> withFilePath file $ \s -> do len <- throwErrnoPathIfMinus1 "readSymbolicLink" file $ c_readlink s buf 4096 diff --git a/libraries/base/tests/Concurrent/ThreadDelay001.hs b/libraries/base/tests/Concurrent/ThreadDelay001.hs index 21bc1178dc..19659faaf7 100644 --- a/libraries/base/tests/Concurrent/ThreadDelay001.hs +++ b/libraries/base/tests/Concurrent/ThreadDelay001.hs @@ -1,5 +1,7 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE BangPatterns #-} +{-# LANGUAGE CPP #-} +{-# HLINT ignore "Unused LANGUAGE pragma" #-} + -- Test that threadDelay actually sleeps for (at least) as long as we -- ask it @@ -16,6 +18,7 @@ import Data.Time #if defined(mingw32_HOST_OS) import GHC.Event.Windows.Clock #endif + main :: IO () main = mapM_ delay (0 : take 7 (iterate (*5) 100)) |