diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -## 3 +### 3.0.1 +* Require quickcheck-instances >= 0.3.12 in test suite due to presence of new orphan Arbitrary instances for `vector` datatypes + +# 3 * GHC 8.0 support * Rename functions that previously ended with the suffix `-With` to instead have the prefix `lift-`, consistent with `text-show-3` * Removed the `TextShow.Data.Semigroup` and `TextShow.Data.List.NonEmpty` modules, as they have been moved to `text-show-3` (as part of moving `Semigroup` into `base`) diff --git a/tests/Spec/Language/Haskell/THSpec.hs b/tests/Spec/Language/Haskell/THSpec.hs --- a/tests/Spec/Language/Haskell/THSpec.hs +++ b/tests/Spec/Language/Haskell/THSpec.hs @@ -17,7 +17,7 @@ import Language.Haskell.TH.PprLib import Language.Haskell.TH.Syntax -import Spec.Utils (prop_matchesTextShow, prop_genericTextShow) +import Spec.Utils (prop_matchesTextShow) import Test.Hspec (Spec, describe, hspec, parallel) import Test.Hspec.QuickCheck (prop) @@ -31,189 +31,140 @@ spec :: Spec spec = parallel $ do #if MIN_VERSION_template_haskell(2,9,0) - describe "AnnLookup" $ do + describe "AnnLookup" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> AnnLookup -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> AnnLookup -> Bool) - describe "AnnTarget" $ do + describe "AnnTarget" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> AnnTarget -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> AnnTarget -> Bool) #endif #if MIN_VERSION_template_haskell(2,11,0) - describe "Bang" $ do + describe "Bang" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Bang -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Bang -> Bool) #endif - describe "Body" $ do + describe "Body" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Body -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Body -> Bool) - describe "Callconv" $ do + describe "Callconv" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Callconv -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Callconv -> Bool) #if MIN_VERSION_template_haskell(2,5,0) && !(MIN_VERSION_template_haskell(2,7,0)) - describe "ClassInstance" $ do + describe "ClassInstance" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> ClassInstance -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> ClassInstance -> Bool) #endif - describe "Clause" $ do + describe "Clause" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Clause -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Clause -> Bool) - describe "Con" $ do + describe "Con" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Con -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Con -> Bool) - describe "Dec" $ do + describe "Dec" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Dec -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Dec -> Bool) #if MIN_VERSION_template_haskell(2,11,0) - describe "DecidedStrictness" $ do + describe "DecidedStrictness" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> DecidedStrictness -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> DecidedStrictness -> Bool) #endif describe "Doc" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Doc -> Bool) - describe "Exp" $ do + describe "Exp" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Exp -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Exp -> Bool) - describe "FamFlavour" $ do + describe "FamFlavour" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> FamFlavour -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> FamFlavour -> Bool) #if MIN_VERSION_template_haskell(2,11,0) - describe "FamilyResultSig" $ do + describe "FamilyResultSig" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> FamilyResultSig -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> FamilyResultSig -> Bool) #endif - describe "Fixity" $ do + describe "Fixity" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Fixity -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Fixity -> Bool) - describe "FixityDirection" $ do + describe "FixityDirection" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> FixityDirection -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> FixityDirection -> Bool) - describe "Foreign" $ do + describe "Foreign" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Foreign -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Foreign -> Bool) - describe "FunDep" $ do + describe "FunDep" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> FunDep -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> FunDep -> Bool) - describe "Guard" $ do + describe "Guard" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Guard -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Guard -> Bool) - describe "Info" $ do + describe "Info" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Info -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Info -> Bool) #if MIN_VERSION_template_haskell(2,11,0) - describe "InjectivityAnn" $ do + describe "InjectivityAnn" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> InjectivityAnn -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> InjectivityAnn -> Bool) #endif #if MIN_VERSION_template_haskell(2,8,0) - describe "Inline" $ do + describe "Inline" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Inline -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Inline -> Bool) #else - describe "InlineSpec" $ do + describe "InlineSpec" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> InlineSpec -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> InlineSpec -> Bool) #endif - describe "Kind" $ do + describe "Kind" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Kind -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Kind -> Bool) - describe "Lit" $ do + describe "Lit" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Lit -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Lit -> Bool) - describe "Loc" $ do + describe "Loc" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Loc -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Loc -> Bool) - describe "Match" $ do + describe "Match" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Match -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Match -> Bool) - describe "ModName" $ do + describe "ModName" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> ModName -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> ModName -> Bool) #if MIN_VERSION_template_haskell(2,9,0) - describe "Module" $ do + describe "Module" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Module -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Module -> Bool) - describe "ModuleInfo" $ do + describe "ModuleInfo" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> ModuleInfo -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> ModuleInfo -> Bool) #endif describe "Name" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Name -> Bool) - describe "showbName'" $ do + describe "showbName'" $ prop "has the same output as showName" prop_showName' - describe "OccName" $ do + describe "OccName" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> OccName -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> OccName -> Bool) - describe "Pat" $ do + describe "Pat" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Pat -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Pat -> Bool) #if MIN_VERSION_template_haskell(2,8,0) - describe "Phases" $ do + describe "Phases" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Phases -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Phases -> Bool) #endif - describe "PkgName" $ do + describe "PkgName" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> PkgName -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> PkgName -> Bool) - describe "Pred" $ do + describe "Pred" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Pred -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Pred -> Bool) - describe "Pragma" $ do + describe "Pragma" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Pragma -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Pragma -> Bool) - describe "Range" $ do + describe "Range" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Range -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Range -> Bool) #if MIN_VERSION_template_haskell(2,9,0) - describe "Role" $ do + describe "Role" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Role -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Role -> Bool) #endif #if MIN_VERSION_template_haskell(2,8,0) - describe "RuleBndr" $ do + describe "RuleBndr" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> RuleBndr -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> RuleBndr -> Bool) - describe "RuleMatch" $ do + describe "RuleMatch" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> RuleMatch -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> RuleMatch -> Bool) #endif - describe "Safety" $ do + describe "Safety" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Safety -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Safety -> Bool) #if MIN_VERSION_template_haskell(2,11,0) - describe "SourceStrictness" $ do + describe "SourceStrictness" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> SourceStrictness -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> SourceStrictness -> Bool) - describe "SourceUnpackedness" $ do + describe "SourceUnpackedness" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> SourceUnpackedness -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> SourceUnpackedness -> Bool) #endif - describe "Stmt" $ do + describe "Stmt" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Stmt -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Stmt -> Bool) - describe "Strict" $ do + describe "Strict" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Strict -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Strict -> Bool) #if MIN_VERSION_template_haskell(2,8,0) - describe "TyLit" $ do + describe "TyLit" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> TyLit -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> TyLit -> Bool) #endif - describe "Type" $ do + describe "Type" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> Type -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> Type -> Bool) #if MIN_VERSION_template_haskell(2,11,0) - describe "TypeFamilyHead" $ do + describe "TypeFamilyHead" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> TypeFamilyHead -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> TypeFamilyHead -> Bool) #endif #if MIN_VERSION_template_haskell(2,9,0) - describe "TySynEqn" $ do + describe "TySynEqn" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> TySynEqn -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> TySynEqn -> Bool) #endif - describe "TyVarBndr" $ do + describe "TyVarBndr" $ prop "TextShow instance" (prop_matchesTextShow :: Int -> TyVarBndr -> Bool) - prop "generic TextShow" (prop_genericTextShow :: Int -> TyVarBndr -> Bool) -- | Verifies that `showName'` and `showbName'` have the same output. prop_showName' :: NameIs -> Name -> Bool diff --git a/text-show-instances.cabal b/text-show-instances.cabal --- a/text-show-instances.cabal +++ b/text-show-instances.cabal @@ -1,5 +1,5 @@ name: text-show-instances -version: 3 +version: 3.0.1 synopsis: Additional instances for text-show description: @text-show-instances@ is a supplemental library to @text-show@ that provides additional @Show@ instances for data types in @@ -226,7 +226,7 @@ , old-time >= 1 && < 1.2 , pretty >= 1 && < 1.2 , QuickCheck >= 2.5 && < 3 - , quickcheck-instances >= 0.1 && < 0.4 + , quickcheck-instances >= 0.3.12 && < 0.4 , random >= 1.0.1 && < 1.2 , semigroups >= 0.17 && < 1 , tagged >= 0.4.4 && < 1 @@ -241,7 +241,7 @@ , vector >= 0.9 && < 0.12 , xhtml >= 3000.2 && < 3000.3 if !flag(developer) - build-depends: text-show-instances == 3 + build-depends: text-show-instances == 3.0.1 hs-source-dirs: tests if flag(developer)