diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ `stan` uses [PVP Versioning][1]. The change log is available [on GitHub][2]. +## 0.1.3.0 + +* Add prospective support for GHC 9.10 + + * thanks to @philderbeast + ## 0.1.2.1 * Support `clay-0.15` series. diff --git a/src/Stan/Core/Id.hs b/src/Stan/Core/Id.hs --- a/src/Stan/Core/Id.hs +++ b/src/Stan/Core/Id.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-redundant-constraints #-} +{-# OPTIONS_GHC -Wno-redundant-constraints #-} {-# LANGUAGE AllowAmbiguousTypes #-} {-# LANGUAGE DataKinds #-} diff --git a/src/Stan/Example.hs b/src/Stan/Example.hs --- a/src/Stan/Example.hs +++ b/src/Stan/Example.hs @@ -1,5 +1,5 @@ {- HLINT ignore "Unused LANGUAGE pragma" -} -{-# OPTIONS_GHC -fno-warn-unused-top-binds #-} +{-# OPTIONS_GHC -Wno-unused-top-binds #-} {-# LANGUAGE NoUndecidableInstances #-} {-# LANGUAGE PatternSynonyms #-} diff --git a/src/Stan/Ghc/Compat.hs b/src/Stan/Ghc/Compat.hs --- a/src/Stan/Ghc/Compat.hs +++ b/src/Stan/Ghc/Compat.hs @@ -14,4 +14,6 @@ import Stan.Ghc.Compat906 as Compat #elif __GLASGOW_HASKELL__ == 908 import Stan.Ghc.Compat906 as Compat +#elif __GLASGOW_HASKELL__ == 910 +import Stan.Ghc.Compat906 as Compat #endif diff --git a/src/Stan/Ghc/Compat902.hs b/src/Stan/Ghc/Compat902.hs --- a/src/Stan/Ghc/Compat902.hs +++ b/src/Stan/Ghc/Compat902.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE UndecidableInstances #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} module Stan.Ghc.Compat902 #if __GLASGOW_HASKELL__ == 902 || __GLASGOW_HASKELL__ == 904 diff --git a/src/Stan/Ghc/Compat906.hs b/src/Stan/Ghc/Compat906.hs --- a/src/Stan/Ghc/Compat906.hs +++ b/src/Stan/Ghc/Compat906.hs @@ -1,10 +1,10 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE UndecidableInstances #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} module Stan.Ghc.Compat906 -#if __GLASGOW_HASKELL__ == 906 || __GLASGOW_HASKELL__ == 908 +#if __GLASGOW_HASKELL__ == 906 || __GLASGOW_HASKELL__ == 908 || __GLASGOW_HASKELL__ == 910 ( -- * Modules Module , ModuleName diff --git a/src/Stan/Hie/Compat.hs b/src/Stan/Hie/Compat.hs --- a/src/Stan/Hie/Compat.hs +++ b/src/Stan/Hie/Compat.hs @@ -14,4 +14,6 @@ import Stan.Hie.Compat904 as Compat #elif __GLASGOW_HASKELL__ == 908 import Stan.Hie.Compat904 as Compat +#elif __GLASGOW_HASKELL__ == 910 +import Stan.Hie.Compat904 as Compat #endif diff --git a/src/Stan/Hie/Compat904.hs b/src/Stan/Hie/Compat904.hs --- a/src/Stan/Hie/Compat904.hs +++ b/src/Stan/Hie/Compat904.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} module Stan.Hie.Compat904 -#if __GLASGOW_HASKELL__ == 904 || __GLASGOW_HASKELL__ == 906 || __GLASGOW_HASKELL__ == 908 +#if __GLASGOW_HASKELL__ == 904 || __GLASGOW_HASKELL__ == 906 || __GLASGOW_HASKELL__ == 908 || __GLASGOW_HASKELL__== 910 ( -- * Main HIE types ContextInfo (..) , HieArgs (..) diff --git a/src/Stan/Hie/Debug.hs b/src/Stan/Hie/Debug.hs --- a/src/Stan/Hie/Debug.hs +++ b/src/Stan/Hie/Debug.hs @@ -14,4 +14,6 @@ import Stan.Hie.Debug902 as Compat #elif __GLASGOW_HASKELL__ == 908 import Stan.Hie.Debug908 as Compat +#elif __GLASGOW_HASKELL__ == 910 +import Stan.Hie.Debug908 as Compat #endif diff --git a/src/Stan/Hie/Debug810.hs b/src/Stan/Hie/Debug810.hs --- a/src/Stan/Hie/Debug810.hs +++ b/src/Stan/Hie/Debug810.hs @@ -1,6 +1,6 @@ {-# LANGUAGE CPP #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {- | Copyright: (c) 2020 Kowainik diff --git a/src/Stan/Hie/Debug900.hs b/src/Stan/Hie/Debug900.hs --- a/src/Stan/Hie/Debug900.hs +++ b/src/Stan/Hie/Debug900.hs @@ -1,6 +1,6 @@ {-# LANGUAGE CPP #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-# LANGUAGE FlexibleInstances #-} diff --git a/src/Stan/Hie/Debug902.hs b/src/Stan/Hie/Debug902.hs --- a/src/Stan/Hie/Debug902.hs +++ b/src/Stan/Hie/Debug902.hs @@ -1,6 +1,6 @@ {-# LANGUAGE CPP #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-# LANGUAGE FlexibleInstances #-} diff --git a/src/Stan/Hie/Debug908.hs b/src/Stan/Hie/Debug908.hs --- a/src/Stan/Hie/Debug908.hs +++ b/src/Stan/Hie/Debug908.hs @@ -1,6 +1,6 @@ {-# LANGUAGE CPP #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-# LANGUAGE FlexibleInstances #-} @@ -21,7 +21,7 @@ -} module Stan.Hie.Debug908 -#if __GLASGOW_HASKELL__ == 908 +#if __GLASGOW_HASKELL__ == 908 || __GLASGOW_HASKELL__ == 910 ( debugHieFile ) where diff --git a/src/Stan/Inspection/AntiPattern.hs b/src/Stan/Inspection/AntiPattern.hs --- a/src/Stan/Inspection/AntiPattern.hs +++ b/src/Stan/Inspection/AntiPattern.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE CPP #-} + {- | Copyright: (c) 2020 Kowainik SPDX-License-Identifier: MPL-2.0 @@ -55,7 +57,7 @@ import Stan.Inspection (Inspection (..), InspectionAnalysis (..), InspectionsMap, categoryL, descriptionL, severityL, solutionL) import Stan.NameMeta (NameMeta (..), baseNameFrom, mkBaseFoldableMeta, mkBaseOldListMeta, - primTypeMeta, textNameFrom, unorderedNameFrom) + primTypeMeta, textNameFrom, unorderedNameFrom, _nameFrom) import Stan.Pattern.Ast (Literal (..), PatternAst (..), anyNamesToPatternAst, app, namesToPatternAst, opApp, range) import Stan.Pattern.Edsl (PatternBool (..)) @@ -327,7 +329,13 @@ This is odd and needs more investigation. -} filePathType :: PatternType - filePathType = "FilePath" `baseNameFrom` "GHC.IO" |:: [] + filePathType = +#if __GLASGOW_HASKELL__ < 910 + "FilePath" `_nameFrom` "GHC.IO" +#else + "FilePath" `_nameFrom` "GHC.Internal.IO" +#endif + |:: [] ||| stringPattern ||| primTypeMeta "[]" |:: [ charPattern ] @@ -345,13 +353,22 @@ where pat :: PatternAst pat = anyNamesToPatternAst - $ "undefined" `baseNameFrom` "GHC.Err" :| - [ "unsafeCoerce" `baseNameFrom` "Unsafe.Coerce" - , "unsafePerformIO" `baseNameFrom` "GHC.IO.Unsafe" - , "unsafeInterleaveIO" `baseNameFrom` "GHC.IO.Unsafe" - , "unsafeDupablePerformIO" `baseNameFrom` "GHC.IO.Unsafe" +#if __GLASGOW_HASKELL__ < 910 + $ "undefined" `_nameFrom` "GHC.Err" :| + [ "unsafeCoerce" `_nameFrom` "Unsafe.Coerce" + , "unsafePerformIO" `_nameFrom` "GHC.IO.Unsafe" + , "unsafeInterleaveIO" `_nameFrom` "GHC.IO.Unsafe" + , "unsafeDupablePerformIO" `_nameFrom` "GHC.IO.Unsafe" +#else + $ "undefined" `_nameFrom` "GHC.Internal.Err" :| + [ "unsafeCoerce" `_nameFrom` "GHC.Internal.Unsafe.Coerce" + , "unsafePerformIO" `_nameFrom` "GHC.Internal.IO.Unsafe" + , "unsafeInterleaveIO" `_nameFrom` "GHC.Internal.IO.Unsafe" + , "unsafeDupablePerformIO" `_nameFrom` "GHC.Internal.IO.Unsafe" +#endif , "unsafeFixIO" `baseNameFrom` "System.IO.Unsafe" ] + -- | 'Inspection' — Pattent matching on @_@ for sum types — @STAN-0213@. stan0213 :: Inspection diff --git a/src/Stan/Inspection/Partial.hs b/src/Stan/Inspection/Partial.hs --- a/src/Stan/Inspection/Partial.hs +++ b/src/Stan/Inspection/Partial.hs @@ -69,7 +69,7 @@ import Stan.Inspection (Inspection (..), InspectionAnalysis (..), InspectionsMap, analysisL, categoryL, descriptionL, solutionL) import Stan.NameMeta (NameMeta (..), baseNameFrom, mkBaseFoldableMeta, mkBaseListMeta, - mkBaseOldListMeta) + mkBaseOldListMeta, _nameFrom) import Stan.Pattern.Ast (PatternAst (PatternAstName), namesToPatternAst) import Stan.Pattern.Edsl (PatternBool (..)) import Stan.Pattern.Type (PatternType (..), integerPattern, listFunPattern, listPattern, @@ -156,7 +156,12 @@ & solutionL .~ solution where enumMeta :: NameMeta - enumMeta = funName `baseNameFrom` "GHC.Enum" + enumMeta = +#if __GLASGOW_HASKELL__ < 910 + funName `_nameFrom` "GHC.Enum" +#else + funName `_nameFrom` "GHC.Internal.Enum" +#endif -- | 'Inspection' — partial 'GHC.List.head' @STAN-0001@. stan0001 :: Inspection @@ -197,7 +202,12 @@ ] where fromJustNameMeta :: NameMeta - fromJustNameMeta = "fromJust" `baseNameFrom` "Data.Maybe" + fromJustNameMeta = +#if __GLASGOW_HASKELL__ < 910 + "fromJust" `_nameFrom` "Data.Maybe" +#else + "fromJust" `_nameFrom` "GHC.Internal.Data.Maybe" +#endif -- | 'Inspection' — partial 'Text.Read.read' @STAN-0009@. stan0009 :: Inspection @@ -208,7 +218,12 @@ ] where readNameMeta :: NameMeta - readNameMeta = "read" `baseNameFrom` "Text.Read" + readNameMeta = +#if __GLASGOW_HASKELL__ < 910 + "read" `_nameFrom` "Text.Read" +#else + "read" `_nameFrom` "GHC.Internal.Text.Read" +#endif -- | 'Inspection' — partial 'GHC.Enum.succ' @STAN-0010@. stan0010 :: Inspection @@ -281,8 +296,10 @@ pat = listPattern |-> nonEmptyPattern #if __GLASGOW_HASKELL__ < 904 exts = "fromList" `baseNameFrom` "GHC.Exts" -#else +#elif __GLASGOW_HASKELL__ < 910 exts = "fromList" `baseNameFrom` "GHC.IsList" +#else + exts = "fromList" `_nameFrom` "GHC.Internal.IsList" #endif ne = "fromList" `baseNameFrom` "Data.List.NonEmpty" @@ -290,6 +307,10 @@ stan0021 :: Inspection stan0021 = mkPartialInspectionPattern (Id "STAN-0021") - ("fromInteger" `baseNameFrom` "GHC.Num") +#if __GLASGOW_HASKELL__ < 910 + ("fromInteger" `_nameFrom` "GHC.Num") +#else + ("fromInteger" `_nameFrom` "GHC.Internal.Num") +#endif (integerPattern |-> naturalPattern) "" diff --git a/src/Stan/NameMeta.hs b/src/Stan/NameMeta.hs --- a/src/Stan/NameMeta.hs +++ b/src/Stan/NameMeta.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE CPP #-} + {- | Copyright: (c) 2020 Kowainik SPDX-License-Identifier: MPL-2.0 @@ -19,6 +21,8 @@ -- * Smart constructors , baseNameFrom + , ghcInternalNameFrom + , _nameFrom , mkBaseListMeta , mkBaseOldListMeta , mkBaseFoldableMeta @@ -126,23 +130,53 @@ , nameMetaPackage = "base" } +infix 8 `ghcInternalNameFrom` +ghcInternalNameFrom :: Text -> ModuleName -> NameMeta +ghcInternalNameFrom funName moduleName = NameMeta + { nameMetaName = funName + , nameMetaModuleName = moduleName + , nameMetaPackage = "ghc-internal" + } + +_nameFrom :: Text -> ModuleName -> NameMeta +#if __GLASGOW_HASKELL__ < 910 +_nameFrom = baseNameFrom +#else +_nameFrom = ghcInternalNameFrom +#endif + {- | Create 'NameMeta' for a function from the @base@ package and the "GHC.List" module. -} mkBaseListMeta :: Text -> NameMeta -mkBaseListMeta = (`baseNameFrom` "GHC.List") +mkBaseListMeta = +#if __GLASGOW_HASKELL__ < 910 + (`_nameFrom` "GHC.List") +#else + (`_nameFrom` "GHC.Internal.List") +#endif {- | Create 'NameMeta' for a function from the @base@ package and the "Data.OldList" module. -} mkBaseOldListMeta :: Text -> NameMeta -mkBaseOldListMeta = (`baseNameFrom` "Data.OldList") +mkBaseOldListMeta = +#if __GLASGOW_HASKELL__ < 910 + (`_nameFrom` "Data.OldList") +#else + (`_nameFrom` "GHC.Internal.Data.OldList") +#endif {- | Create 'NameMeta' for a function from the @base@ package and the "Data.Foldable" module. -} mkBaseFoldableMeta :: Text -> NameMeta -mkBaseFoldableMeta = (`baseNameFrom` "Data.Foldable") +mkBaseFoldableMeta = +#if __GLASGOW_HASKELL__ < 910 + (`_nameFrom` "Data.Foldable") +#else + (`_nameFrom` "GHC.Internal.Data.Foldable") +#endif {- | Create 'NameMeta' for a function from the @unordered-containers@ package and a given 'ModuleName' module. diff --git a/src/Stan/Pattern/Ast.hs b/src/Stan/Pattern/Ast.hs --- a/src/Stan/Pattern/Ast.hs +++ b/src/Stan/Pattern/Ast.hs @@ -135,7 +135,13 @@ -- | 'lambdaCase' is a pattern for @\case@ expression (not considering branches). lambdaCase :: PatternAst -lambdaCase = PatternAstNode (one (mkNodeAnnotation "HsLamCase" "HsExpr")) +lambdaCase = PatternAstNode (one (mkNodeAnnotation +#if __GLASGOW_HASKELL__ < 910 + "HsLamCase" +#else + "HsLam" +#endif + "HsExpr")) -- | 'case'' is a pattern for @case EXP of@ expression (not considering branches). case' :: PatternAst diff --git a/src/Stan/Pattern/Type.hs b/src/Stan/Pattern/Type.hs --- a/src/Stan/Pattern/Type.hs +++ b/src/Stan/Pattern/Type.hs @@ -1,4 +1,4 @@ -{-# LANGuAGE CPP #-} +{-# LANGUAGE CPP #-} {- HLINT ignore "Avoid lambda using `infix`" -} @@ -35,7 +35,7 @@ , foldableMethodsPatterns ) where -import Stan.NameMeta (NameMeta (..), baseNameFrom, ghcPrimNameFrom, primTypeMeta, textNameFrom) +import Stan.NameMeta (NameMeta (..), baseNameFrom, ghcPrimNameFrom, primTypeMeta, textNameFrom, _nameFrom) import Stan.Pattern.Edsl (PatternBool (..)) @@ -94,7 +94,12 @@ listPattern = listNameMeta |:: [ (?) ] ||| - "String" `baseNameFrom` "GHC.Base" |:: [] +#if __GLASGOW_HASKELL__ >= 910 + "String" `_nameFrom` "GHC.Internal.Base" +#else + "String" `_nameFrom` "GHC.Base" +#endif + |:: [] where listNameMeta :: NameMeta #if __GLASGOW_HASKELL__ < 906 @@ -105,7 +110,13 @@ -- | 'PatternType' for 'NonEmpty'. nonEmptyPattern :: PatternType -nonEmptyPattern = "NonEmpty" `baseNameFrom` "GHC.Base" |:: [ (?) ] +nonEmptyPattern = +#if __GLASGOW_HASKELL__ >= 910 + "NonEmpty" `_nameFrom` "GHC.Internal.Base" +#else + "NonEmpty" `_nameFrom` "GHC.Base" +#endif + |:: [ (?) ] -- | 'PatternType' for @[a] -> _@ or @String -> _@. listFunPattern :: PatternType @@ -152,7 +163,13 @@ -- | 'PatternType' for 'String'. stringPattern :: PatternType -stringPattern = "String" `baseNameFrom` "GHC.Base" |:: [] +stringPattern = +#if __GLASGOW_HASKELL__ >= 910 + "String" `_nameFrom` "GHC.Internal.Base" +#else + "String" `_nameFrom` "GHC.Base" +#endif + |:: [] -- | 'PatternType' for 'Text'. textPattern :: PatternType @@ -168,11 +185,23 @@ -- | 'PatternType' for 'Maybe' maybePattern :: PatternType -maybePattern = "Maybe" `baseNameFrom` "GHC.Maybe" |:: [ (?) ] +maybePattern = +#if __GLASGOW_HASKELL__ >= 910 + "Maybe" `_nameFrom` "GHC.Internal.Maybe" +#else + "Maybe" `_nameFrom` "GHC.Maybe" +#endif + |:: [ (?) ] -- | 'PatternType' for 'Either' eitherPattern :: PatternType -eitherPattern = "Either" `baseNameFrom` "Data.Either" |:: [ (?), (?) ] +eitherPattern = +#if __GLASGOW_HASKELL__ >= 910 + "Either" `_nameFrom` "GHC.Internal.Data.Either" +#else + "Either" `_nameFrom` "Data.Either" +#endif + |:: [ (?), (?) ] -- | 'PatternType' for pair @(,)@. pairPattern :: PatternType @@ -184,8 +213,10 @@ where #if __GLASGOW_HASKELL__ < 906 ghcTuple = "GHC.Tuple" -#elif __GLASGOW_HASKELL__ >= 906 +#elif __GLASGOW_HASKELL__ < 910 ghcTuple = "GHC.Tuple.Prim" +#else + ghcTuple = "GHC.Tuple" #endif {- | Type patterns for the 'Foldable' typeclass methods. Represented @@ -220,4 +251,9 @@ ofType = (,) method :: Text -> NameMeta - method name = name `baseNameFrom` "Data.Foldable" + method name = +#if __GLASGOW_HASKELL__ >= 910 + name `_nameFrom` "GHC.Internal.Data.Foldable" +#else + name `_nameFrom` "Data.Foldable" +#endif diff --git a/src/Stan/Report/Html.hs b/src/Stan/Report/Html.hs --- a/src/Stan/Report/Html.hs +++ b/src/Stan/Report/Html.hs @@ -376,9 +376,9 @@ traverse_ toSeverityRow (universe @Severity) where toSeverityRow :: Severity -> Html - toSeverityRow s = tr $ do - td (severity $ show s) - td (toHtml $ severityDescription s) + toSeverityRow sv = tr $ do + td (severity $ show sv) + td (toHtml $ severityDescription sv) stanFooter :: Html stanFooter = footer $ do diff --git a/stack-ghc-9.6.3.yaml b/stack-ghc-9.6.3.yaml --- a/stack-ghc-9.6.3.yaml +++ b/stack-ghc-9.6.3.yaml @@ -3,7 +3,7 @@ extra-deps: - ansi-wl-pprint-0.6.9@sha256:fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212,2448 - dir-traverse-0.2.3.0@sha256:adcc128f201ff95131b15ffe41365dc99c50dc3fa3a910f021521dc734013bfa,2137 -- extensions-0.1.0.1@sha256:f365d1da5ea1c60edd11334113ecd0d78eb12b4186b31151322ff7175a9adef7,5108 +- extensions-0.1.0.1@sha256:131270f3dd3adfa96e48259a200b7303c4f8211f54bff168fb8020dfef2aaec7,5269 - optparse-applicative-0.17.1.0@sha256:cb5f5f0dc9749846fc0e3df0041a8efee6368cc1cff07336acd4c3b02a951ed6,5147 - tomland-1.3.3.2@sha256:887dc39a8c9819deb8fcb6fde72e87dad4c94108b1736a5bf7215ccf3117bd0f,9474 - trial-0.0.0.0@sha256:ebd93f3485dd7f0ce8426fa46b500f26edbea285c2890150123e1b0f6a92c7db,4410 diff --git a/stack-ghc-9.6.4.yaml b/stack-ghc-9.6.4.yaml new file mode 100644 --- /dev/null +++ b/stack-ghc-9.6.4.yaml @@ -0,0 +1,12 @@ +resolver: lts-22.20 # GHC 9.6.4 + +extra-deps: +- ansi-wl-pprint-0.6.9@sha256:fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212,2448 +- dir-traverse-0.2.3.0@sha256:adcc128f201ff95131b15ffe41365dc99c50dc3fa3a910f021521dc734013bfa,2137 +- extensions-0.1.0.1@sha256:131270f3dd3adfa96e48259a200b7303c4f8211f54bff168fb8020dfef2aaec7,5269 +- optparse-applicative-0.17.1.0@sha256:cb5f5f0dc9749846fc0e3df0041a8efee6368cc1cff07336acd4c3b02a951ed6,5147 +- tomland-1.3.3.2@sha256:887dc39a8c9819deb8fcb6fde72e87dad4c94108b1736a5bf7215ccf3117bd0f,9474 +- trial-0.0.0.0@sha256:ebd93f3485dd7f0ce8426fa46b500f26edbea285c2890150123e1b0f6a92c7db,4410 +- trial-optparse-applicative-0.0.0.0@sha256:ee878dbf412849d4fb52d7bca93bec45a6392a93e03a46bd320109b9a0ff2a38,2540 +- trial-tomland-0.0.0.0@sha256:c10c5c3f94e3dcfcad4a66cf70682ace77d5381596aff91fa2030636d07de977,2541 +- validation-selective-0.2.0.0@sha256:e1ab5482dede8bf676d729a09109c7c5f798363b9d458e4197a27afb8b48fdd3,3907 diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -1,9 +1,9 @@ -resolver: lts-22.7 # GHC 9.6.4 +resolver: lts-22.21 # GHC 9.6.5 extra-deps: - ansi-wl-pprint-0.6.9@sha256:fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212,2448 - dir-traverse-0.2.3.0@sha256:adcc128f201ff95131b15ffe41365dc99c50dc3fa3a910f021521dc734013bfa,2137 -- extensions-0.1.0.1@sha256:f365d1da5ea1c60edd11334113ecd0d78eb12b4186b31151322ff7175a9adef7,5108 +- extensions-0.1.0.1@sha256:131270f3dd3adfa96e48259a200b7303c4f8211f54bff168fb8020dfef2aaec7,5269 - optparse-applicative-0.17.1.0@sha256:cb5f5f0dc9749846fc0e3df0041a8efee6368cc1cff07336acd4c3b02a951ed6,5147 - tomland-1.3.3.2@sha256:887dc39a8c9819deb8fcb6fde72e87dad4c94108b1736a5bf7215ccf3117bd0f,9474 - trial-0.0.0.0@sha256:ebd93f3485dd7f0ce8426fa46b500f26edbea285c2890150123e1b0f6a92c7db,4410 diff --git a/stan.cabal b/stan.cabal --- a/stan.cabal +++ b/stan.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: stan -version: 0.1.2.1 +version: 0.1.3.0 synopsis: Haskell STatic ANalyser description: Stan is a Haskell __ST__atic __AN__alysis CLI tool. @@ -20,6 +20,7 @@ extra-source-files: test/.stan-example.toml stack-ghc-9.4.8.yaml stack-ghc-9.6.3.yaml + stack-ghc-9.6.4.yaml stack.yaml tested-with: GHC == 8.8.4 GHC == 8.10.7 @@ -29,7 +30,7 @@ location: https://github.com/kowainik/stan.git common common-options - build-depends: base >= 4.13 && < 4.20 && (< 4.16.3.0 || >= 4.17) + build-depends: base >= 4.13 && < 4.21 && (< 4.16.3.0 || >= 4.17) -- ^^ .hie files don't contain enough type -- information on ghc-9.2.[4-8] (base >= -- 4.16.3.0 && < 4.17) @@ -48,6 +49,8 @@ -fwrite-ide-info -hiedir=.hie if impl(ghc >= 8.10) + -- WARNING: This warning reports false positives. + -- SEE: https://gitlab.haskell.org/ghc/ghc/-/issues/24173 ghc-options: -Wunused-packages default-language: Haskell2010 @@ -140,14 +143,14 @@ , bytestring >= 0.10 && < 0.13 , clay >= 0.14 && < 0.16 , colourista >= 0.1 && < 0.3 - , containers >= 0.5 && < 0.7 + , containers >= 0.5 && < 0.8 , cryptohash-sha1 ^>= 0.11 , dir-traverse ^>= 0.2.2.2 , directory ^>= 1.3 , extensions ^>= 0.0.0.1 || ^>= 0.1.0.0 - , filepath ^>= 1.4 - , ghc >= 8.8 && < 9.9 - , ghc-boot-th >= 8.8 && < 9.9 + , filepath >= 1.4 && < 1.6 + , ghc >= 8.8 && < 9.11 + , ghc-boot-th >= 8.8 && < 9.11 , gitrev ^>= 1.3.1 , microaeson ^>= 0.1.0.0 , optparse-applicative >= 0.15 && < 0.19 @@ -203,7 +206,7 @@ build-depends: stan , containers - , filepath ^>= 1.4 + , filepath , ghc , hedgehog >= 1.0 && < 1.5 , hspec >= 2.7 && < 2.12 diff --git a/target/Target/AntiPattern.hs b/target/Target/AntiPattern.hs --- a/target/Target/AntiPattern.hs +++ b/target/Target/AntiPattern.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-missing-export-lists #-} +{-# OPTIONS_GHC -Wno-missing-export-lists #-} module Target.AntiPattern where diff --git a/target/Target/AntiPattern/Stan0206.hs b/target/Target/AntiPattern/Stan0206.hs --- a/target/Target/AntiPattern/Stan0206.hs +++ b/target/Target/AntiPattern/Stan0206.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-missing-export-lists #-} +{-# OPTIONS_GHC -Wno-missing-export-lists #-} {-# LANGUAGE ExistentialQuantification #-} module Target.AntiPattern.Stan0206 where diff --git a/target/Target/AntiPattern/Stan0206Extensions.hs b/target/Target/AntiPattern/Stan0206Extensions.hs --- a/target/Target/AntiPattern/Stan0206Extensions.hs +++ b/target/Target/AntiPattern/Stan0206Extensions.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-missing-export-lists #-} +{-# OPTIONS_GHC -Wno-missing-export-lists #-} {-# LANGUAGE StrictData #-} diff --git a/target/Target/AntiPattern/Stan0212.hs b/target/Target/AntiPattern/Stan0212.hs --- a/target/Target/AntiPattern/Stan0212.hs +++ b/target/Target/AntiPattern/Stan0212.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-missing-export-lists #-} +{-# OPTIONS_GHC -Wno-missing-export-lists #-} module Target.AntiPattern.Stan0212 where diff --git a/target/Target/AntiPattern/Stan0213.hs b/target/Target/AntiPattern/Stan0213.hs --- a/target/Target/AntiPattern/Stan0213.hs +++ b/target/Target/AntiPattern/Stan0213.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-missing-export-lists #-} +{-# OPTIONS_GHC -Wno-missing-export-lists #-} {- | Sum types pattern matching on @_@ -} diff --git a/target/Target/AntiPattern/Stan0214.hs b/target/Target/AntiPattern/Stan0214.hs --- a/target/Target/AntiPattern/Stan0214.hs +++ b/target/Target/AntiPattern/Stan0214.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-missing-export-lists #-} +{-# OPTIONS_GHC -Wno-missing-export-lists #-} module Target.AntiPattern.Stan0214 where diff --git a/target/Target/Infinite.hs b/target/Target/Infinite.hs --- a/target/Target/Infinite.hs +++ b/target/Target/Infinite.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-missing-export-lists #-} +{-# OPTIONS_GHC -Wno-missing-export-lists #-} module Target.Infinite where diff --git a/target/Target/Partial.hs b/target/Target/Partial.hs --- a/target/Target/Partial.hs +++ b/target/Target/Partial.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-missing-export-lists #-} +{-# OPTIONS_GHC -Wno-missing-export-lists #-} module Target.Partial where diff --git a/target/Target/Style.hs b/target/Target/Style.hs --- a/target/Target/Style.hs +++ b/target/Target/Style.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-missing-export-lists #-} +{-# OPTIONS_GHC -Wno-missing-export-lists #-} module Target.Style where