From 6533ac893e184d386fbc767aa6acd86f61e66ea9 Mon Sep 17 00:00:00 2001 From: Jens Nolte <jens@nightmarestudio.de> Date: Mon, 3 Feb 2020 03:05:14 +0100 Subject: [PATCH] Move intercalate for Monoid to Prelude --- src/Prelude.hs | 7 +++++++ src/QBar/BlockOutput.hs | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Prelude.hs b/src/Prelude.hs index 29aed66..1c06223 100644 --- a/src/Prelude.hs +++ b/src/Prelude.hs @@ -13,6 +13,7 @@ module Prelude traceShow, traceShowId, Maybe.listToMaybe, + intercalate ) where @@ -60,3 +61,9 @@ traceShow = Trace.traceShow {-# DEPRECATED traceShowId "Partitial Function." #-} traceShowId :: Show a => a -> a traceShowId = Trace.traceShowId + + +intercalate :: Monoid a => a -> [a] -> a +intercalate _ [] = mempty +intercalate _ [x] = x +intercalate inter (x:xs) = x <> inter <> intercalate inter xs diff --git a/src/QBar/BlockOutput.hs b/src/QBar/BlockOutput.hs index f5144ea..cce0087 100644 --- a/src/QBar/BlockOutput.hs +++ b/src/QBar/BlockOutput.hs @@ -25,11 +25,6 @@ instance Semigroup BlockText where instance Monoid BlockText where mempty = BlockText [] -intercalate :: Monoid a => a -> [a] -> a -intercalate _ [] = mempty -intercalate _ [x] = x -intercalate inter (x:xs) = x <> inter <> intercalate inter xs - data BlockTextSegment = BlockTextSegment { active :: Bool, importance :: Importance, -- GitLab