diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55efa3d..f4f44e5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: - uses: purescript-contrib/setup-purescript@main with: - purescript: "0.14.0-rc3" + purescript: "0.14.0-rc5" - uses: actions/setup-node@v1 with: diff --git a/src/Data/NonEmpty.purs b/src/Data/NonEmpty.purs index baf6c80..4135c5c 100644 --- a/src/Data/NonEmpty.purs +++ b/src/Data/NonEmpty.purs @@ -22,7 +22,7 @@ import Data.FoldableWithIndex (class FoldableWithIndex, foldMapWithIndex, foldlW import Data.FunctorWithIndex (class FunctorWithIndex, mapWithIndex) import Data.Maybe (Maybe(..), maybe) import Data.Ord (class Ord1) -import Data.Semigroup.Foldable (class Foldable1, foldMap1) +import Data.Semigroup.Foldable (class Foldable1) import Data.Semigroup.Foldable (foldl1) as Foldable1 import Data.Traversable (class Traversable, traverse, sequence) import Data.TraversableWithIndex (class TraversableWithIndex, traverseWithIndex) @@ -161,7 +161,6 @@ instance traversableWithIndexNonEmpty NonEmpty <$> f Nothing a <*> traverseWithIndex (f <<< Just) fa instance foldable1NonEmpty :: Foldable f => Foldable1 (NonEmpty f) where - fold1 = foldMap1 identity foldMap1 f (a :| fa) = foldl (\s a1 -> s <> f a1) (f a) fa foldr1 f (a :| fa) = maybe a (f a) $ foldr (\a1 -> Just <<< maybe a1 (f a1)) Nothing fa foldl1 f (a :| fa) = foldl f a fa diff --git a/test/Main.purs b/test/Main.purs index 9e3fcac..acf08e7 100644 --- a/test/Main.purs +++ b/test/Main.purs @@ -4,8 +4,8 @@ import Prelude import Data.Foldable (fold, foldl) import Data.Maybe (Maybe(..)) -import Data.NonEmpty (NonEmpty, (:|), foldl1, oneOf, head, tail, singleton) -import Data.Semigroup.Foldable (fold1, foldr1) +import Data.NonEmpty (NonEmpty, (:|), oneOf, head, tail, singleton) +import Data.Semigroup.Foldable (fold1, foldl1, foldr1) import Data.Unfoldable1 as U1 import Effect (Effect) import Test.Assert (assert)