picnoir/hnix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove hackyStringMappend

Browse source
This commit is contained in:
Ken Micklas 2018-11-17 13:39:08 -05:00
parent 4018fd0ccf
commit b7ad125c46
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Nix/String.hs
View file

@ -8,7 +8,6 @@ module Nix.String (
, hackyMakeNixStringWithoutContext
, hackyModifyNixContents
, principledStringMappend
, hackyStringMappend
, principledStringMConcat
) where
@ -18,7 +17,7 @@ import Data.Text (Text)
import GHC.Generics
import Data.Semigroup
-- {-# WARNING hackyStringMappend, hackyStringIgnoreContextMaybe, hackyStringIgnoreContext, hackyMakeNixStringWithoutContext, hackyModifyNixContents "This NixString function needs to be replaced" #-}
-- {-# WARNING hackyStringIgnoreContextMaybe, hackyStringIgnoreContext, hackyMakeNixStringWithoutContext, hackyModifyNixContents "This NixString function needs to be replaced" #-}
-- | A 'ContextFlavor' describes the sum of possible derivations for string contexts
data ContextFlavor =
@ -47,13 +46,9 @@ instance Hashable NixString
principledStringMappend :: NixString -> NixString -> NixString
principledStringMappend (NixString s1 t1) (NixString s2 t2) = NixString (s1 <> s2) (t1 <> t2)
-- | Combine two NixStrings using mappend
hackyStringMappend :: NixString -> NixString -> NixString
hackyStringMappend (NixString s1 t1) (NixString s2 t2) = NixString (s1 <> s2) (t1 <> t2)
-- | Combine NixStrings using mconcat
principledStringMConcat :: [NixString] -> NixString
principledStringMConcat = foldr hackyStringMappend (NixString mempty mempty)
principledStringMConcat = foldr principledStringMappend (NixString mempty mempty)
--instance Semigroup NixString where
--NixString s1 t1 <> NixString s2 t2 = NixString (s1 <> s2) (t1 <> t2)