diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.2 +* Allow build with `text-show-3.2` + ### 3.0.1 * Require quickcheck-instances >= 0.3.12 in test suite due to presence of new orphan Arbitrary instances for `vector` datatypes diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2014, Ryan Scott +Copyright (c) 2014-2016, Ryan Scott All rights reserved. diff --git a/src/TextShow/Compiler/Hoopl.hs b/src/TextShow/Compiler/Hoopl.hs --- a/src/TextShow/Compiler/Hoopl.hs +++ b/src/TextShow/Compiler/Hoopl.hs @@ -5,7 +5,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.Compiler.Hoopl -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Control/Applicative/Trans.hs b/src/TextShow/Control/Applicative/Trans.hs --- a/src/TextShow/Control/Applicative/Trans.hs +++ b/src/TextShow/Control/Applicative/Trans.hs @@ -3,7 +3,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.Control.Applicative.Trans -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Control/Monad/Trans.hs b/src/TextShow/Control/Monad/Trans.hs --- a/src/TextShow/Control/Monad/Trans.hs +++ b/src/TextShow/Control/Monad/Trans.hs @@ -3,7 +3,7 @@ {-# OPTIONS_GHC -fno-warn-orphans -fno-warn-warnings-deprecations #-} {-| Module: TextShow.Control.Monad.Trans -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Data/Bifunctor.hs b/src/TextShow/Data/Bifunctor.hs --- a/src/TextShow/Data/Bifunctor.hs +++ b/src/TextShow/Data/Bifunctor.hs @@ -5,7 +5,7 @@ {-| Module: TextShow.Data.Bifunctor -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Data/Binary.hs b/src/TextShow/Data/Binary.hs --- a/src/TextShow/Data/Binary.hs +++ b/src/TextShow/Data/Binary.hs @@ -4,7 +4,7 @@ {-| Module: TextShow.Data.Binary -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Data/Containers.hs b/src/TextShow/Data/Containers.hs --- a/src/TextShow/Data/Containers.hs +++ b/src/TextShow/Data/Containers.hs @@ -3,7 +3,7 @@ {-# OPTIONS -fno-warn-orphans #-} {-| Module: TextShow.Data.Containers -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Data/Functor/Trans.hs b/src/TextShow/Data/Functor/Trans.hs --- a/src/TextShow/Data/Functor/Trans.hs +++ b/src/TextShow/Data/Functor/Trans.hs @@ -8,7 +8,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.Data.Functor.Trans -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Data/Tagged.hs b/src/TextShow/Data/Tagged.hs --- a/src/TextShow/Data/Tagged.hs +++ b/src/TextShow/Data/Tagged.hs @@ -8,7 +8,7 @@ {-# OPTIONS -fno-warn-orphans #-} {-| Module: TextShow.Data.Tagged -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Data/Time.hs b/src/TextShow/Data/Time.hs --- a/src/TextShow/Data/Time.hs +++ b/src/TextShow/Data/Time.hs @@ -6,7 +6,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.Data.Time -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Data/UnorderedContainers.hs b/src/TextShow/Data/UnorderedContainers.hs --- a/src/TextShow/Data/UnorderedContainers.hs +++ b/src/TextShow/Data/UnorderedContainers.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.Data.UnorderedContainers -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Data/Vector.hs b/src/TextShow/Data/Vector.hs --- a/src/TextShow/Data/Vector.hs +++ b/src/TextShow/Data/Vector.hs @@ -3,7 +3,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.Data.Vector -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Instances.hs b/src/TextShow/Instances.hs --- a/src/TextShow/Instances.hs +++ b/src/TextShow/Instances.hs @@ -6,7 +6,7 @@ {-| Module: TextShow.Instances -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Language/Haskell/TH.hs b/src/TextShow/Language/Haskell/TH.hs --- a/src/TextShow/Language/Haskell/TH.hs +++ b/src/TextShow/Language/Haskell/TH.hs @@ -6,7 +6,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.Language.Haskell.TH -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/System/Console/Haskeline.hs b/src/TextShow/System/Console/Haskeline.hs --- a/src/TextShow/System/Console/Haskeline.hs +++ b/src/TextShow/System/Console/Haskeline.hs @@ -4,7 +4,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.System.Console.Haskeline -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/System/Console/Terminfo.hs b/src/TextShow/System/Console/Terminfo.hs --- a/src/TextShow/System/Console/Terminfo.hs +++ b/src/TextShow/System/Console/Terminfo.hs @@ -7,7 +7,7 @@ {-| Module: TextShow.System.Console.Terminfo -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/System/Directory.hs b/src/TextShow/System/Directory.hs --- a/src/TextShow/System/Directory.hs +++ b/src/TextShow/System/Directory.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.System.Directory -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/System/Locale.hs b/src/TextShow/System/Locale.hs --- a/src/TextShow/System/Locale.hs +++ b/src/TextShow/System/Locale.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.System.Locale -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/System/Posix.hs b/src/TextShow/System/Posix.hs --- a/src/TextShow/System/Posix.hs +++ b/src/TextShow/System/Posix.hs @@ -7,7 +7,7 @@ {-| Module: TextShow.System.Posix -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/System/Random.hs b/src/TextShow/System/Random.hs --- a/src/TextShow/System/Random.hs +++ b/src/TextShow/System/Random.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.System.Random -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/System/Time.hs b/src/TextShow/System/Time.hs --- a/src/TextShow/System/Time.hs +++ b/src/TextShow/System/Time.hs @@ -3,7 +3,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.System.Time -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/System/Win32.hs b/src/TextShow/System/Win32.hs --- a/src/TextShow/System/Win32.hs +++ b/src/TextShow/System/Win32.hs @@ -7,7 +7,7 @@ {-| Module: TextShow.System.Win32 -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Text/PrettyPrint.hs b/src/TextShow/Text/PrettyPrint.hs --- a/src/TextShow/Text/PrettyPrint.hs +++ b/src/TextShow/Text/PrettyPrint.hs @@ -3,7 +3,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.Text.PrettyPrint -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Text/XHtml.hs b/src/TextShow/Text/XHtml.hs --- a/src/TextShow/Text/XHtml.hs +++ b/src/TextShow/Text/XHtml.hs @@ -3,7 +3,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.Text.XHtml -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Trace/Hpc.hs b/src/TextShow/Trace/Hpc.hs --- a/src/TextShow/Trace/Hpc.hs +++ b/src/TextShow/Trace/Hpc.hs @@ -3,7 +3,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: TextShow.Trace.Hpc -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/src/TextShow/Utils.hs b/src/TextShow/Utils.hs --- a/src/TextShow/Utils.hs +++ b/src/TextShow/Utils.hs @@ -2,7 +2,7 @@ {-| Module: TextShow.Utils -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Compiler/Hoopl.hs b/tests/Instances/Compiler/Hoopl.hs --- a/tests/Instances/Compiler/Hoopl.hs +++ b/tests/Instances/Compiler/Hoopl.hs @@ -5,7 +5,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Compiler.Hoopl -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Control/Applicative/Trans.hs b/tests/Instances/Control/Applicative/Trans.hs --- a/tests/Instances/Control/Applicative/Trans.hs +++ b/tests/Instances/Control/Applicative/Trans.hs @@ -4,7 +4,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Control.Applicative.Trans -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Control/Monad/Trans.hs b/tests/Instances/Control/Monad/Trans.hs --- a/tests/Instances/Control/Monad/Trans.hs +++ b/tests/Instances/Control/Monad/Trans.hs @@ -6,7 +6,7 @@ {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-} {-| Module: Instances.Control.Monad.Trans -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Data/Bifunctor.hs b/tests/Instances/Data/Bifunctor.hs --- a/tests/Instances/Data/Bifunctor.hs +++ b/tests/Instances/Data/Bifunctor.hs @@ -6,7 +6,7 @@ {-| Module: Instances.Data.Bifunctor -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Data/Binary.hs b/tests/Instances/Data/Binary.hs --- a/tests/Instances/Data/Binary.hs +++ b/tests/Instances/Data/Binary.hs @@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Data.Binary -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Data/Containers.hs b/tests/Instances/Data/Containers.hs --- a/tests/Instances/Data/Containers.hs +++ b/tests/Instances/Data/Containers.hs @@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Data.Containers -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Data/Functor/Trans.hs b/tests/Instances/Data/Functor/Trans.hs --- a/tests/Instances/Data/Functor/Trans.hs +++ b/tests/Instances/Data/Functor/Trans.hs @@ -4,7 +4,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Data.Functor.Trans -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Data/Tagged.hs b/tests/Instances/Data/Tagged.hs --- a/tests/Instances/Data/Tagged.hs +++ b/tests/Instances/Data/Tagged.hs @@ -3,7 +3,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Data.Tagged -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Language/Haskell/TH.hs b/tests/Instances/Language/Haskell/TH.hs --- a/tests/Instances/Language/Haskell/TH.hs +++ b/tests/Instances/Language/Haskell/TH.hs @@ -7,7 +7,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Language.Haskell.TH -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Miscellaneous.hs b/tests/Instances/Miscellaneous.hs --- a/tests/Instances/Miscellaneous.hs +++ b/tests/Instances/Miscellaneous.hs @@ -4,7 +4,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Miscellaneous -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/System/Console/Haskeline.hs b/tests/Instances/System/Console/Haskeline.hs --- a/tests/Instances/System/Console/Haskeline.hs +++ b/tests/Instances/System/Console/Haskeline.hs @@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.System.Console.Haskeline -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/System/Console/Terminfo.hs b/tests/Instances/System/Console/Terminfo.hs --- a/tests/Instances/System/Console/Terminfo.hs +++ b/tests/Instances/System/Console/Terminfo.hs @@ -6,7 +6,7 @@ {-| Module: Instances.System.Console.Terminfo -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/System/Directory.hs b/tests/Instances/System/Directory.hs --- a/tests/Instances/System/Directory.hs +++ b/tests/Instances/System/Directory.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.System.Directory -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/System/Locale.hs b/tests/Instances/System/Locale.hs --- a/tests/Instances/System/Locale.hs +++ b/tests/Instances/System/Locale.hs @@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.System.Locale -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/System/Posix.hs b/tests/Instances/System/Posix.hs --- a/tests/Instances/System/Posix.hs +++ b/tests/Instances/System/Posix.hs @@ -7,7 +7,7 @@ {-| Module: Instances.System.Posix -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/System/Random.hs b/tests/Instances/System/Random.hs --- a/tests/Instances/System/Random.hs +++ b/tests/Instances/System/Random.hs @@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.System.Random -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/System/Win32.hs b/tests/Instances/System/Win32.hs --- a/tests/Instances/System/Win32.hs +++ b/tests/Instances/System/Win32.hs @@ -8,7 +8,7 @@ {-| Module: Instances.System.Win32 -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Text/PrettyPrint.hs b/tests/Instances/Text/PrettyPrint.hs --- a/tests/Instances/Text/PrettyPrint.hs +++ b/tests/Instances/Text/PrettyPrint.hs @@ -4,7 +4,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Text.PrettyPrint -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Text/XHtml.hs b/tests/Instances/Text/XHtml.hs --- a/tests/Instances/Text/XHtml.hs +++ b/tests/Instances/Text/XHtml.hs @@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Text.XHtml -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Trace/Hpc.hs b/tests/Instances/Trace/Hpc.hs --- a/tests/Instances/Trace/Hpc.hs +++ b/tests/Instances/Trace/Hpc.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Trace.Hpc -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Instances/Utils.hs b/tests/Instances/Utils.hs --- a/tests/Instances/Utils.hs +++ b/tests/Instances/Utils.hs @@ -1,6 +1,6 @@ {-| Module: Instances.Utils -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Compiler/HooplSpec.hs b/tests/Spec/Compiler/HooplSpec.hs --- a/tests/Spec/Compiler/HooplSpec.hs +++ b/tests/Spec/Compiler/HooplSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.Compiler.HooplSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Control/Applicative/TransSpec.hs b/tests/Spec/Control/Applicative/TransSpec.hs --- a/tests/Spec/Control/Applicative/TransSpec.hs +++ b/tests/Spec/Control/Applicative/TransSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.Control.Applicative.TransSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Control/Monad/TransSpec.hs b/tests/Spec/Control/Monad/TransSpec.hs --- a/tests/Spec/Control/Monad/TransSpec.hs +++ b/tests/Spec/Control/Monad/TransSpec.hs @@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-} {-| Module: Spec.Control.Monad.TransSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Data/BifunctorSpec.hs b/tests/Spec/Data/BifunctorSpec.hs --- a/tests/Spec/Data/BifunctorSpec.hs +++ b/tests/Spec/Data/BifunctorSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.Data.BifunctorSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Data/BinarySpec.hs b/tests/Spec/Data/BinarySpec.hs --- a/tests/Spec/Data/BinarySpec.hs +++ b/tests/Spec/Data/BinarySpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.Data.BinarySpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Data/ContainersSpec.hs b/tests/Spec/Data/ContainersSpec.hs --- a/tests/Spec/Data/ContainersSpec.hs +++ b/tests/Spec/Data/ContainersSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.Data.ContainersSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Data/Functor/TransSpec.hs b/tests/Spec/Data/Functor/TransSpec.hs --- a/tests/Spec/Data/Functor/TransSpec.hs +++ b/tests/Spec/Data/Functor/TransSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.Data.Functor.TransSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Data/TaggedSpec.hs b/tests/Spec/Data/TaggedSpec.hs --- a/tests/Spec/Data/TaggedSpec.hs +++ b/tests/Spec/Data/TaggedSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.Data.TaggedSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Data/TimeSpec.hs b/tests/Spec/Data/TimeSpec.hs --- a/tests/Spec/Data/TimeSpec.hs +++ b/tests/Spec/Data/TimeSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.Data.TimeSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Data/UnorderedContainersSpec.hs b/tests/Spec/Data/UnorderedContainersSpec.hs --- a/tests/Spec/Data/UnorderedContainersSpec.hs +++ b/tests/Spec/Data/UnorderedContainersSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.Data.UnorderedContainersSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional 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 @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-| Module: Spec.Language.Haskell.THSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/System/Console/HaskelineSpec.hs b/tests/Spec/System/Console/HaskelineSpec.hs --- a/tests/Spec/System/Console/HaskelineSpec.hs +++ b/tests/Spec/System/Console/HaskelineSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.System.Console.HaskelineSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/System/Console/TerminfoSpec.hs b/tests/Spec/System/Console/TerminfoSpec.hs --- a/tests/Spec/System/Console/TerminfoSpec.hs +++ b/tests/Spec/System/Console/TerminfoSpec.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-| Module: Spec.System.Console.TerminfoSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/System/DirectorySpec.hs b/tests/Spec/System/DirectorySpec.hs --- a/tests/Spec/System/DirectorySpec.hs +++ b/tests/Spec/System/DirectorySpec.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-| Module: Spec.System.DirectorySpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/System/LocaleSpec.hs b/tests/Spec/System/LocaleSpec.hs --- a/tests/Spec/System/LocaleSpec.hs +++ b/tests/Spec/System/LocaleSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.System.LocaleSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/System/PosixSpec.hs b/tests/Spec/System/PosixSpec.hs --- a/tests/Spec/System/PosixSpec.hs +++ b/tests/Spec/System/PosixSpec.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-| Module: Spec.System.PosixSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/System/RandomSpec.hs b/tests/Spec/System/RandomSpec.hs --- a/tests/Spec/System/RandomSpec.hs +++ b/tests/Spec/System/RandomSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.System.RandomSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/System/TimeSpec.hs b/tests/Spec/System/TimeSpec.hs --- a/tests/Spec/System/TimeSpec.hs +++ b/tests/Spec/System/TimeSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.System.TimeSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/System/Win32Spec.hs b/tests/Spec/System/Win32Spec.hs --- a/tests/Spec/System/Win32Spec.hs +++ b/tests/Spec/System/Win32Spec.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-| Module: Spec.System.Win32Spec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Text/PrettyPrintSpec.hs b/tests/Spec/Text/PrettyPrintSpec.hs --- a/tests/Spec/Text/PrettyPrintSpec.hs +++ b/tests/Spec/Text/PrettyPrintSpec.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-| Module: Spec.Text.PrettyPrintSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Text/XHtmlSpec.hs b/tests/Spec/Text/XHtmlSpec.hs --- a/tests/Spec/Text/XHtmlSpec.hs +++ b/tests/Spec/Text/XHtmlSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.Text.XHtmlSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Trace/HpcSpec.hs b/tests/Spec/Trace/HpcSpec.hs --- a/tests/Spec/Trace/HpcSpec.hs +++ b/tests/Spec/Trace/HpcSpec.hs @@ -1,6 +1,6 @@ {-| Module: Spec.Trace.HpcSpec -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional diff --git a/tests/Spec/Utils.hs b/tests/Spec/Utils.hs --- a/tests/Spec/Utils.hs +++ b/tests/Spec/Utils.hs @@ -3,7 +3,7 @@ {-| Module: Spec.Utils -Copyright: (C) 2014-2015 Ryan Scott +Copyright: (C) 2014-2016 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Provisional @@ -68,13 +68,15 @@ -- | Verifies that a type's 'TextShow' instance coincides with the output produced -- by the equivalent 'Generic' functions. -prop_genericTextShow :: (TextShow a, Generic a, GTextShow (Rep a)) +prop_genericTextShow :: (TextShow a, Generic a, GTextShow Zero (Rep a)) => Int -> a -> Bool prop_genericTextShow p x = showbPrec p x == genericShowbPrec p x -- | Verifies that a type's 'TextShow1' instance coincides with the output produced -- by the equivalent 'Generic1' functions. -prop_genericTextShow1 :: (TextShow1 f, Generic1 f, GTextShow1 (Rep1 f), TextShow a) +prop_genericTextShow1 :: ( TextShow1 f, Generic1 f + , GTextShow One (Rep1 f), TextShow a + ) => Int -> f a -> Bool prop_genericTextShow1 p x = showbPrec1 p x == genericLiftShowbPrec showbPrec showbList p x 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.0.1 +version: 3.2 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 @@ -62,7 +62,7 @@ author: Ryan Scott maintainer: Ryan Scott stability: Experimental -copyright: (C) 2014-2015 Ryan Scott +copyright: (C) 2014-2016 Ryan Scott category: Text build-type: Simple tested-with: GHC == 7.0.4 @@ -232,7 +232,7 @@ , tagged >= 0.4.4 && < 1 , template-haskell >= 2.5 && < 2.12 , text >= 0.11.1 && < 1.3 - , text-show >= 3 && < 4 + , text-show >= 3.2 && < 4 , th-orphans >= 0.12 && < 1 , time >= 0.1 && < 1.7 , transformers >= 0.2.1 && < 0.6 @@ -241,7 +241,7 @@ , vector >= 0.9 && < 0.12 , xhtml >= 3000.2 && < 3000.3 if !flag(developer) - build-depends: text-show-instances == 3.0.1 + build-depends: text-show-instances == 3.2 hs-source-dirs: tests if flag(developer)