(hacky->principled)MakeNixStringWithoutContext

Author: Anton-Latukha

src/Nix/Builtins.hs

@@ -104,7 +104,7 @@ withNixContext mpath action = do
   opts :: Options <- asks (view hasLens)
   let i = nvList $ map
         ( nvStr
-        . hackyMakeNixStringWithoutContext
+        . principledMakeNixStringWithoutContext
         . Text.pack
         )
         (include opts)
@@ -341,12 +341,12 @@ nixPath = fmap nvList $ flip foldNixPath [] $ \p mn ty rest ->
           PathEntryPath -> ("path", nvPath p)
           PathEntryURI ->
             ( "uri"
-            , nvStr $ hackyMakeNixStringWithoutContext $ Text.pack p
+            , nvStr $ principledMakeNixStringWithoutContext $ Text.pack p
             )
 
         , ( "prefix"
           , nvStr
-            $ hackyMakeNixStringWithoutContext $ Text.pack $ fromMaybe "" mn
+            $ principledMakeNixStringWithoutContext $ Text.pack $ fromMaybe "" mn
           )
         ]
       )
@@ -657,7 +657,7 @@ splitMatches numDropped (((_, (start, len)) : captures) : mts) haystack =
   caps           = nvList (map f captures)
   f (a, (s, _)) = if s < 0 then nvConstant NNull else thunkStr a
 
-thunkStr s = nvStr (hackyMakeNixStringWithoutContext (decodeUtf8 s))
+thunkStr s = nvStr (principledMakeNixStringWithoutContext (decodeUtf8 s))
 
 substring :: forall e t f m. MonadNix e t f m => Int -> Int -> NixString -> Prim m NixString
 substring start len str = Prim $
@@ -1321,7 +1321,7 @@ fromJSON arg = demand arg $ fromValue >=> fromStringNoContext >=> \encoded ->
   jsonToNValue = \case
     A.Object m -> flip nvSet M.empty <$> traverse jsonToNValue m
     A.Array  l -> nvList <$> traverse jsonToNValue (V.toList l)
-    A.String s -> pure $ nvStr $ hackyMakeNixStringWithoutContext s
+    A.String s -> pure $ nvStr $ principledMakeNixStringWithoutContext s
     A.Number n -> pure $ nvConstant $ case floatingOrInteger n of
       Left  r -> NFloat r
       Right i -> NInt i

src/Nix/Convert.hs

@@ -303,7 +303,7 @@ instance Convertible e t f m
 
 instance Convertible e t f m
   => ToValue ByteString m (NValue' t f m (NValue t f m)) where
-  toValue = pure . nvStr' . hackyMakeNixStringWithoutContext . decodeUtf8
+  toValue = pure . nvStr' . principledMakeNixStringWithoutContext . decodeUtf8
 
 instance Convertible e t f m
   => ToValue Path m (NValue' t f m (NValue t f m)) where

src/Nix/String.hs

@@ -177,10 +177,6 @@ hackyStringIgnoreContext (NixString s _) = s
 stringHasContext :: NixString -> Bool
 stringHasContext (NixString _ c) = not (null c)
 
--- | Constructs a NixString without a context
-hackyMakeNixStringWithoutContext :: Text -> NixString
-hackyMakeNixStringWithoutContext = flip NixString mempty
-
 -- | Constructs a NixString without a context
 principledMakeNixStringWithoutContext :: Text -> NixString
 principledMakeNixStringWithoutContext = flip NixString mempty
@@ -252,3 +248,7 @@ hackyStringMappend (NixString s1 t1) (NixString s2 t2) =
 hackyStringMConcat :: [NixString] -> NixString
 hackyStringMConcat = foldr principledStringMappend (NixString mempty mempty)
 
+-- | Constructs a NixString without a context
+hackyMakeNixStringWithoutContext :: Text -> NixString
+hackyMakeNixStringWithoutContext = principledMakeNixStringWithoutContext
+