on master help sign in
Merge pull request #766 from obsidiansystems/eac@eradicate-warnings

Eradicate warnings

commit86545e259e4f2542689bc76483bdd856da1ff845 authorElliot Cameron <3noch@users.noreply.github.com> dateTue 16 Jun 2020, 15:22 (6 years ago) parenta622a45b85c65b
15 files changed+27−23
lib/asset/manifest/obelisk-asset-manifest.cabal+3−1 lib/asset/serve-snap/obelisk-asset-serve-snap.cabal+3−1 lib/backend/obelisk-backend.cabal+1−1 lib/cliapp/obelisk-cliapp.cabal+1−1 lib/cliapp/src/Obelisk/CliApp/Logging.hs+2−2 lib/cliapp/src/Obelisk/CliApp/Process.hs+6−7 lib/command/obelisk-command.cabal+1−1 lib/executable-config/inject/obelisk-executable-config-inject.cabal+1−1 lib/frontend/obelisk-frontend.cabal+1−1 lib/route/obelisk-route.cabal+1−1 lib/run/obelisk-run.cabal+1−1 lib/snap-extras/obelisk-snap-extras.cabal+1−1 skeleton/backend/backend.cabal+2−1 skeleton/common/common.cabal+1−1 skeleton/frontend/frontend.cabal+2−2
lib/asset/manifest/obelisk-asset-manifest.cabal+3−1
@@ -33,7 +33,9 @@ library
3333 Obelisk.Asset.TH
3434
3535 other-extensions: TemplateHaskell
36− ghc-options: -Wall -Werror -fno-warn-unused-do-bind -fwarn-tabs -funbox-strict-fields -O2 -fprof-auto-calls
36+ ghc-options:
37+ -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O2
38+ -fno-warn-unused-do-bind -funbox-strict-fields -fprof-auto-calls
3739
3840executable obelisk-asset-manifest-generate
3941 hs-source-dirs: src-bin
lib/asset/serve-snap/obelisk-asset-serve-snap.cabal+3−1
@@ -29,4 +29,6 @@ library
2929 Obelisk.Asset.Serve.Snap
3030
3131 other-extensions: TemplateHaskell
32− ghc-options: -Wall -Werror -fno-warn-unused-do-bind -fwarn-tabs -funbox-strict-fields -O2 -fprof-auto-calls
32+ ghc-options:
33+ -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O2
34+ -fno-warn-unused-do-bind -funbox-strict-fields -fprof-auto-calls
lib/backend/obelisk-backend.cabal+1−1
@@ -27,4 +27,4 @@ library
2727 text,
2828 universe
2929 exposed-modules: Obelisk.Backend
30− ghc-options: -Wall
30+ ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
lib/cliapp/obelisk-cliapp.cabal+1−1
@@ -34,4 +34,4 @@ library
3434 Obelisk.CliApp.TerminalString
3535 Obelisk.CliApp.Theme
3636 Obelisk.CliApp.Types
37− ghc-options: -Wall -fobject-code
37+ ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
lib/cliapp/src/Obelisk/CliApp/Logging.hs+2−2
@@ -160,7 +160,7 @@ failWith :: (CliThrow e m, AsUnstructuredError e) => Text -> m a
160160failWith = throwError . review asUnstructuredError
161161
162162errorToWarning
163− :: (HasCliConfig e m, CliThrow e m, CliLog m)
163+ :: (HasCliConfig e m, CliLog m)
164164 => e -> m ()
165165errorToWarning e = do
166166 c <- getCliConfig
@@ -177,7 +177,7 @@ withExitFailMessage msg f = f `catch` \(e :: ExitCode) -> do
177177 throwM e
178178
179179-- | Write log to stdout, with colors (unless `noColor`)
180−writeLog :: (MonadIO m, MonadMask m) => Bool -> Bool -> WithSeverity Text -> m ()
180+writeLog :: (MonadIO m) => Bool -> Bool -> WithSeverity Text -> m ()
181181writeLog withNewLine noColor (WithSeverity severity s) = if T.null s then pure () else write
182182 where
183183 write
lib/cliapp/src/Obelisk/CliApp/Process.hs+6−7
@@ -1,7 +1,6 @@
11{-# LANGUAGE FlexibleContexts #-}
22{-# LANGUAGE LambdaCase #-}
33{-# LANGUAGE MultiParamTypeClasses #-}
4−{-# LANGUAGE MultiWayIf #-}
54{-# LANGUAGE OverloadedStrings #-}
65{-# LANGUAGE ScopedTypeVariables #-}
76{-# LANGUAGE TupleSections #-}
@@ -102,7 +101,7 @@ instance AsProcessFailure ProcessFailure where
102101 asProcessFailure = id
103102
104103readProcessAndLogStderr
105− :: (MonadIO m, CliLog m, CliThrow e m, AsProcessFailure e, MonadFail m, MonadMask m)
104+ :: (MonadIO m, CliLog m, CliThrow e m, AsProcessFailure e, MonadMask m)
106105 => Severity -> ProcessSpec -> m Text
107106readProcessAndLogStderr sev process = do
108107 (out, _err) <- withProcess process $ \_out err -> do
@@ -110,7 +109,7 @@ readProcessAndLogStderr sev process = do
110109 liftIO $ T.decodeUtf8With lenientDecode <$> BS.hGetContents out
111110
112111readProcessJSONAndLogStderr
113− :: (Aeson.FromJSON a, MonadIO m, CliLog m, CliThrow e m, AsProcessFailure e, MonadFail m, MonadMask m)
112+ :: (Aeson.FromJSON a, MonadIO m, CliLog m, CliThrow e m, AsProcessFailure e, MonadMask m)
114113 => Severity -> ProcessSpec -> m a
115114readProcessJSONAndLogStderr sev process = do
116115 (out, _err) <- withProcess process $ \_out err -> do
@@ -123,7 +122,7 @@ readProcessJSONAndLogStderr sev process = do
123122 throwError $ review asProcessFailure $ ProcessFailure (Process.cmdspec $ _processSpec_createProcess process) 0
124123
125124readCreateProcessWithExitCode
126− :: (MonadIO m, CliLog m, CliThrow e m, AsProcessFailure e)
125+ :: (MonadIO m, CliLog m)
127126 => ProcessSpec -> m (ExitCode, String, String)
128127readCreateProcessWithExitCode procSpec = do
129128 process <- mkCreateProcess procSpec
@@ -159,7 +158,7 @@ readProcessAndLogOutput (sev_out, sev_err) process = do
159158-- which case it is advisable to call it with a non-Error severity for stderr, like
160159-- `callProcessAndLogOutput (Debug, Debug)`.
161160callProcessAndLogOutput
162− :: (MonadIO m, CliLog m, CliThrow e m, AsProcessFailure e, MonadFail m, MonadMask m)
161+ :: (MonadIO m, CliLog m, CliThrow e m, AsProcessFailure e, MonadMask m)
163162 => (Severity, Severity) -> ProcessSpec -> m ()
164163callProcessAndLogOutput (sev_out, sev_err) process =
165164 void $ withProcess process $ \out err -> do
@@ -212,7 +211,7 @@ callCommand cmd = do
212211 liftIO $ Process.callCommand cmd
213212
214213withProcess
215− :: (MonadIO m, CliLog m, CliThrow e m, AsProcessFailure e, MonadFail m, MonadMask m)
214+ :: (MonadIO m, CliLog m, CliThrow e m, AsProcessFailure e, MonadMask m)
216215 => ProcessSpec -> (Handle -> Handle -> m ()) -> m (Handle, Handle)
217216withProcess process f =
218217 bracketOnError
@@ -229,7 +228,7 @@ withProcess process f =
229228
230229-- | Runs a process to completion failing if it does not exit cleanly.
231230runProcess_
232− :: (MonadIO m, CliLog m, CliThrow e m, MonadMask m, AsProcessFailure e, MonadFail m)
231+ :: (MonadIO m, CliLog m, CliThrow e m, MonadMask m, AsProcessFailure e)
233232 => ProcessSpec -> m ()
234233runProcess_ process =
235234 bracketOnError
lib/command/obelisk-command.cabal+1−1
@@ -66,4 +66,4 @@ library
6666executable ob
6767 main-is: src-bin/ob.hs
6868 build-depends: base, obelisk-command
69− ghc-options: -Wall -O2 -threaded
69+ ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O -threaded
lib/executable-config/inject/obelisk-executable-config-inject.cabal+1−1
@@ -15,4 +15,4 @@ library
1515 text
1616
1717 exposed-modules: Obelisk.ExecutableConfig.Inject
18− ghc-options: -Wall
18+ ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
lib/frontend/obelisk-frontend.cabal+1−1
@@ -26,4 +26,4 @@ library
2626 exposed-modules:
2727 Obelisk.Frontend
2828 Obelisk.Frontend.Cookie
29− ghc-options: -Wall
29+ ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
lib/route/obelisk-route.cabal+1−1
@@ -38,4 +38,4 @@ library
3838 exposed-modules: Obelisk.Route
3939 Obelisk.Route.TH
4040 Obelisk.Route.Frontend
41− ghc-options: -Wall -fwarn-redundant-constraints
41+ ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
lib/run/obelisk-run.cabal+1−1
@@ -47,7 +47,7 @@ library
4747 , websockets
4848 exposed-modules:
4949 Obelisk.Run
50− ghc-options: -Wall -fwarn-redundant-constraints
50+ ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
5151 if os(linux)
5252 cpp-options: -DIPROUTE_SUPPORTED
5353 build-depends: which
lib/snap-extras/obelisk-snap-extras.cabal+1−1
@@ -17,4 +17,4 @@ library
1717 , text
1818 exposed-modules:
1919 Obelisk.Snap.Extras
20− ghc-options: -Wall
20+ ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
skeleton/backend/backend.cabal+2−1
@@ -14,11 +14,12 @@ library
1414 , obelisk-route
1515 exposed-modules:
1616 Backend
17− ghc-options: -Wall
17+ ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
1818
1919executable backend
2020 main-is: main.hs
2121 hs-source-dirs: src-bin
22+ ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
2223 if impl(ghcjs)
2324 buildable: False
2425 build-depends: base
skeleton/common/common.cabal+1−1
@@ -12,4 +12,4 @@ library
1212 exposed-modules:
1313 Common.Api
1414 Common.Route
15− ghc-options: -Wall
15+ ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
skeleton/frontend/frontend.cabal+2−2
@@ -16,7 +16,7 @@ library
1616 , text
1717 exposed-modules:
1818 Frontend
19− ghc-options: -Wall
19+ ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
2020
2121executable frontend
2222 main-is: main.hs
@@ -28,7 +28,7 @@ executable frontend
2828 , reflex-dom
2929 , obelisk-generated-static
3030 , frontend
31− ghc-options: -threaded
31+ ghc-options: -threaded -O -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates
3232 if impl(ghcjs)
3333 ghc-options: -dedupe
3434 cpp-options: -DGHCJS_BROWSER