diff options
| author | stuebinm | 2022-03-19 19:12:04 +0100 |
|---|---|---|
| committer | stuebinm | 2022-03-19 20:07:45 +0100 |
| commit | dbf2253dc4256809b255767cbf4ae9c236f18542 (patch) | |
| tree | ae2eb6e09db7aeab76ef22171c43e679cfa2c86a /src | |
| parent | 25111b467c91e411f1c7a4281c2eee5671db7406 (diff) | |
remove leftover rc3 things & some new stuff
this removes:
- the bbb properties
- all explicit mentions of rc3
- the weird script domain hacks (done via a substitution now)
- some (few) of the weirder code choices
it also adds some more type level witchery to deal with configs, which
for some reason seems to be the hardest problem of this entire program …
also the server now does inter-assembly dependency checking!
Diffstat (limited to 'src')
| -rw-r--r-- | src/Main.hs | 9 | ||||
| -rw-r--r-- | src/Version.hs | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Main.hs b/src/Main.hs index b2002bf..9628e1e 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveAnyClass #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE LambdaCase #-} @@ -15,9 +16,9 @@ import Data.Aeson.Encode.Pretty (encodePretty) import Data.Aeson.KeyMap (coercionToHashMap) import WithCli (HasArguments, withCli) -import CheckDir (recursiveCheckDir, resultIsFatal, DirResult (dirresultGraph)) -import Control.Monad (when) -import LintConfig (LintConfig (..), patchConfig) +import CheckDir (recursiveCheckDir, resultIsFatal) +import LintConfig (ConfigKind (..), LintConfig (..), + patchConfig) import System.Exit (ExitCode (ExitFailure)) import Types (Level (..)) import Util (printPretty) @@ -40,7 +41,7 @@ data Options = Options -- ^ path to write the (possibly adjusted) maps to after linting , configFile :: Maybe FilePath -- ^ path to a config file. Currently required. - , config :: Maybe (LintConfig Maybe) + , config :: Maybe (LintConfig Patch) -- ^ a "patch" for the configuration file , version :: Bool , dot :: Bool diff --git a/src/Version.hs b/src/Version.hs index 2ec1537..e62c9b8 100644 --- a/src/Version.hs +++ b/src/Version.hs @@ -9,7 +9,7 @@ import qualified Language.Haskell.TH as TH import System.Process (readProcess) version :: String -version = "walint rc3 2021 (" <> +version = "walint divoc bb3 2022 (" <> $(do hash <- liftIO $ catchAny (readProcess "git" ["rev-parse", "HEAD"] "") (\_ -> pure "[unknown]") |