Merge branch 'monopointed-bytestring-builder'

BebeSparkelSparkel · Feb 13, 2024 · 02a37e7 · 02a37e7
2 parents c302c97 + d1ea1d7
commit 02a37e7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -36,7 +36,5 @@ jobs:
         shell: bash
         run: |
             set -ex
-            mkdir -p ../_newstack
-            stack upgrade --force-download --local-bin-path ../_newstack
-            ../_newstack/stack --version
-            ../_newstack/stack test --fast --no-terminal --stack-yaml=${{ matrix.stack-yaml }} --resolver=${{ matrix.resolver }}
+            stack --version
+            stack test --fast --no-terminal --stack-yaml=${{ matrix.stack-yaml }} --resolver=${{ matrix.resolver }}
diff --git a/classy-prelude/ChangeLog.md b/classy-prelude/ChangeLog.md
@@ -1,6 +1,11 @@
 # ChangeLog for classy-prelude
 
+## 1.5.0.3
+
+* Don't import Data.Functor.unzip [#215](https://github.com/snoyberg/mono-traversable/pull/215)
+
 ## 1.5.0.2
+
 * Fix building with time >= 1.10 [#207](https://github.com/snoyberg/mono-traversable/pull/207).
 
 ## 1.5.0.1

diff --git a/classy-prelude/package.yaml b/classy-prelude/package.yaml
@@ -1,5 +1,5 @@
 name:          classy-prelude
-version:       1.5.0.2
+version:       1.5.0.3
 synopsis:      A typeclass-based Prelude.
 description:   See docs and README at <http://www.stackage.org/package/classy-prelude>
 category:      Control, Prelude

diff --git a/classy-prelude/src/ClassyPrelude.hs b/classy-prelude/src/ClassyPrelude.hs
@@ -153,7 +153,7 @@ module ClassyPrelude
 
 import qualified Prelude
 import Control.Applicative ((<**>),liftA,liftA2,liftA3,Alternative (..), optional)
-import Data.Functor
+import Data.Functor hiding (unzip)
 import Control.Exception (assert)
 import Control.DeepSeq (deepseq, ($!!), force, NFData (..))
 import Control.Monad (when, unless, void, liftM, ap, forever, join, replicateM_, guard, MonadPlus (..), (=<<), (>=>), (<=<), liftM2, liftM3, liftM4, liftM5)

diff --git a/mono-traversable/src/Data/MonoTraversable.hs b/mono-traversable/src/Data/MonoTraversable.hs
@@ -33,6 +33,7 @@ import           Control.Category
 import           Control.Monad        (Monad (..))
 import qualified Data.ByteString      as S
 import qualified Data.ByteString.Lazy as L
+import qualified Data.ByteString.Builder as B
 import qualified Data.Foldable        as F
 import           Data.Functor
 import           Data.Maybe           (fromMaybe)
@@ -106,6 +107,7 @@ import Control.Monad.Trans.Identity (IdentityT)
 type family Element mono
 type instance Element S.ByteString = Word8
 type instance Element L.ByteString = Word8
+type instance Element B.Builder = Word8
 type instance Element T.Text = Char
 type instance Element TL.Text = Char
 type instance Element [a] = a
@@ -1140,6 +1142,9 @@ instance MonoPointed S.ByteString where
 instance MonoPointed L.ByteString where
     opoint = L.singleton
     {-# INLINE opoint #-}
+instance MonoPointed B.Builder where
+    opoint = B.word8
+    {-# INLINE opoint #-}
 instance MonoPointed T.Text where
     opoint = T.singleton
     {-# INLINE opoint #-}