hspec-core 2.10.0.1 → 2.10.1
raw patch · 4 files changed
+62/−21 lines, 4 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- hspec-core.cabal +1/−1
- src/Test/Hspec/Core/Formatters/Pretty/Parser.hs +58/−19
- test/Test/Hspec/Core/ExampleSpec.hs +2/−0
- version.yaml +1/−1
hspec-core.cabal view
@@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack name: hspec-core-version: 2.10.0.1+version: 2.10.1 license: MIT license-file: LICENSE copyright: (c) 2011-2022 Simon Hengel,
src/Test/Hspec/Core/Formatters/Pretty/Parser.hs view
@@ -17,7 +17,7 @@ import Test.Hspec.Core.Formatters.Pretty.Parser.Types #ifndef __GHCJS__-#if __GLASGOW_HASKELL__ >= 802 && __GLASGOW_HASKELL__ <= 902+#if __GLASGOW_HASKELL__ >= 802 && __GLASGOW_HASKELL__ <= 904 #define PRETTY_PRINTING_SUPPORTED #endif #endif@@ -35,7 +35,12 @@ import GHC.Stack import GHC.Exception (throw, errorCallWithCallStackException) -#if __GLASGOW_HASKELL__ >= 804+#if __GLASGOW_HASKELL__ >= 904+import GHC.Utils.Error+import GHC.Utils.Outputable+#endif++#if __GLASGOW_HASKELL__ >= 804 && __GLASGOW_HASKELL__ < 904 import GHC.LanguageExtensions.Type #endif @@ -52,7 +57,6 @@ import GHC.Data.StringBuffer import GHC.Data.FastString import GHC.Types.SrcLoc-import qualified GHC.Data.EnumSet as EnumSet import GHC.Types.Name import GHC.Types.Name.Reader import GHC.Parser.PostProcess hiding (Tuple)@@ -66,7 +70,12 @@ import RdrName import BasicTypes import Module-#if __GLASGOW_HASKELL__ >= 804+#endif++#if __GLASGOW_HASKELL__ >= 804 && __GLASGOW_HASKELL__ < 904+#if __GLASGOW_HASKELL__ >= 900+import qualified GHC.Data.EnumSet as EnumSet+#else import qualified EnumSet #endif #endif@@ -149,18 +158,27 @@ Literal (Rational n) -> return $ Literal (Rational $ '-' : n) Literal (Integer n) -> return $ Literal (Integer $ negate n) _ -> fail "NegApp"- HsPar _x e -> Parentheses <$> toExpression e++ HsPar _x+#if __GLASGOW_HASKELL__ >= 904+ _ e _ ->+#else+ e ->+#endif+ Parentheses <$> toExpression e ExplicitTuple _x xs _ -> Tuple <$> mapM toExpression xs ExplicitList _ _listSynExpr xs -> List <$> mapM toExpression xs RecCon(name, fields) -> Record (showRdrName name) <$> (recordFields $ rec_flds fields) where+#if __GLASGOW_HASKELL__ >= 904+ hsRecFieldLbl = hfbLHS+ hsRecFieldArg = hfbRHS+#endif fieldName = showFieldLabel . unLoc . hsRecFieldLbl recordFields = mapM (recordField . unLoc) recordField field = (,) (fieldName field) <$> toExpression (hsRecFieldArg field) REJECT(HsUnboundVar)- REJECT(HsConLikeOut)- REJECT(HsRecFld) REJECT(HsOverLabel) REJECT(HsIPVar) REJECT(HsLam)@@ -178,14 +196,15 @@ REJECT(RecordUpd) REJECT(ExprWithTySig) REJECT(ArithSeq)- REJECT(HsBracket)- REJECT(HsRnBracketOut)- REJECT(HsTcBracketOut) REJECT(HsSpliceE) REJECT(HsProc) REJECT(HsStatic)- REJECT(HsTick)- REJECT(HsBinTick)++#if __GLASGOW_HASKELL__ >= 904+ REJECT(HsRecSel)+ REJECT(HsTypedBracket)+ REJECT(HsUntypedBracket)+#endif #if __GLASGOW_HASKELL__ >= 902 REJECT(HsGetField) REJECT(HsProjection)@@ -193,13 +212,23 @@ #if __GLASGOW_HASKELL__ >= 900 REJECT(HsPragE) #endif-#if __GLASGOW_HASKELL__ <= 810++#if __GLASGOW_HASKELL__ < 904+ REJECT(HsConLikeOut)+ REJECT(HsRecFld)+ REJECT(HsBracket)+ REJECT(HsRnBracketOut)+ REJECT(HsTcBracketOut)+ REJECT(HsTick)+ REJECT(HsBinTick)+#endif+#if __GLASGOW_HASKELL__ < 900 REJECT(HsSCC) REJECT(HsCoreAnn) REJECT(HsTickPragma) REJECT(HsWrap) #endif-#if __GLASGOW_HASKELL__ <= 808+#if __GLASGOW_HASKELL__ < 810 REJECT(HsArrApp) REJECT(HsArrForm) REJECT(EWildPat)@@ -207,7 +236,7 @@ REJECT(EViewPat) REJECT(ELazyPat) #endif-#if __GLASGOW_HASKELL__ <= 804+#if __GLASGOW_HASKELL__ < 806 REJECT(HsAppTypeOut) REJECT(ExplicitPArr) REJECT(ExprWithTySigOut)@@ -322,14 +351,24 @@ location = mkRealSrcLoc "" 1 1 input = stringToStringBuffer str parseState = initParserState opts input location- opts = mkParserOpts warn extensions False False False True+ opts = mkParserOpts warn+#if __GLASGOW_HASKELL__ >= 904+ (DiagOpts mempty mempty False False Nothing defaultSDocContext)+#endif+ extensions False False False True -#if __GLASGOW_HASKELL__ >= 804- extensions = EnumSet.fromList [TraditionalRecordSyntax]+#if __GLASGOW_HASKELL__ >= 804 && __GLASGOW_HASKELL__ < 904 warn = EnumSet.empty #else- extensions = mempty warn = mempty+#endif++#if __GLASGOW_HASKELL__ >= 904+ extensions = ["TraditionalRecordSyntax"]+#elif __GLASGOW_HASKELL__ >= 804+ extensions = EnumSet.fromList [TraditionalRecordSyntax]+#else+ extensions = mempty #endif #if __GLASGOW_HASKELL__ <= 900
test/Test/Hspec/Core/ExampleSpec.hs view
@@ -1,6 +1,8 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-}+{-# LANGUAGE TypeOperators #-}+ module Test.Hspec.Core.ExampleSpec (spec) where import Prelude ()
version.yaml view
@@ -1,1 +1,1 @@-&version 2.10.0.1+&version 2.10.1