From dbf2253dc4256809b255767cbf4ae9c236f18542 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Sat, 19 Mar 2022 19:12:04 +0100 Subject: 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! --- src/Main.hs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/Main.hs') 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 -- cgit v1.2.3