Nix/String: form "Deprecated API" to gather hacky* functions

Author: Anton-Latukha

src/Nix/String.hs

@@ -47,8 +47,6 @@ import           Data.Text                      ( Text )
 import qualified Data.Text                     as Text
 import           GHC.Generics
 
--- {-# WARNING hackyGetStringNoContext, hackyStringIgnoreContext, hackyMakeNixStringWithoutContext "This NixString function needs to be replaced" #-}
-
 -- | A 'ContextFlavor' describes the sum of possible derivations for string contexts
 data ContextFlavor =
     DirectPath
@@ -132,13 +130,6 @@ principledStringMappend :: NixString -> NixString -> NixString
 principledStringMappend (NixString s1 t1) (NixString s2 t2) =
   NixString (s1 <> s2) (t1 <> t2)
 
---  2021-01-02: NOTE: This function is ERRADICATED from the source code.
--- ERRADICATE it from the API.
--- | Combine two NixStrings using mappend
-hackyStringMappend :: NixString -> NixString -> NixString
-hackyStringMappend (NixString s1 t1) (NixString s2 t2) =
-  NixString (s1 <> s2) (t1 <> t2)
-
 -- | Combine NixStrings with a separator
 principledIntercalateNixString :: NixString -> [NixString] -> NixString
 principledIntercalateNixString _   []   = principledMempty
@@ -148,12 +139,6 @@ principledIntercalateNixString sep nss  = NixString contents ctx
   contents = Text.intercalate (nsContents sep) (map nsContents nss)
   ctx      = S.unions (nsContext sep : map nsContext nss)
 
---  2021-01-02: NOTE: This function is ERRADICATED from the source code.
--- ERRADICATE it from the API.
--- | Combine NixStrings using mconcat
-hackyStringMConcat :: [NixString] -> NixString
-hackyStringMConcat = foldr principledStringMappend (NixString mempty mempty)
-
 -- | Empty string with empty context.
 principledStringMempty :: NixString
 principledStringMempty = NixString mempty mempty
@@ -250,3 +235,20 @@ runWithStringContext = runIdentity . runWithStringContextT
 -- Warning: this may be unsafe, depending on how you handle the resulting context list.
 runWithStringContext' :: WithStringContextT Identity a -> (a, S.HashSet StringContext)
 runWithStringContext' = runIdentity . runWithStringContextT'
+
+-- * Deprecated API
+
+-- {-# WARNING hackyGetStringNoContext, hackyStringIgnoreContext, hackyMakeNixStringWithoutContext "This NixString function needs to be replaced" #-}
+
+-- NOTE: These functions are ERRADICATED from the source code.
+-- ERRADICATE them from the API.
+
+-- | 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
+hackyStringMConcat :: [NixString] -> NixString
+hackyStringMConcat = foldr principledStringMappend (NixString mempty mempty)
+