Skip to content

Commit 260c3b9

Browse files
committed
Nix.Builtins: replaceStrings: m refactor: unify context passthrough
1 parent a8f0eec commit 260c3b9

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/Nix/Builtins.hs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -957,28 +957,27 @@ replaceStrings tfrom tto ts =
957957
let rest = Text.drop (Text.length prefix) s
958958
pure (prefix, replacement, rest)
959959

960-
finish b =
961-
makeNixString (LazyText.toStrict $ Builder.toLazyText b)
960+
finish = makeNixString . LazyText.toStrict . Builder.toLazyText
962961

963962
go orig result ctx = case lookupPrefix orig of
964963
Nothing ->
965-
case Text.uncons orig of
964+
(case Text.uncons orig of
966965
Nothing ->
967-
finish result ctx
966+
finish result
968967
Just (h, t) ->
969-
go t (result <> Builder.singleton h) ctx
968+
go t (result <> Builder.singleton h)) ctx
970969
Just (prefix, replacementNS, rest) ->
971-
case prefix of
970+
(case prefix of
972971
"" ->
973972
case Text.uncons rest of
974973
Nothing ->
975-
finish (result <> Builder.fromText replacement) (ctx <> newCtx)
974+
finish (result <> Builder.fromText replacement)
976975
Just (h, t) ->
977976
go t (mconcat [ result
978977
, Builder.fromText replacement
979-
, Builder.singleton h ]) (ctx <> newCtx)
978+
, Builder.singleton h ])
980979
_prefix ->
981-
go rest (result <> Builder.fromText replacement) (ctx <> newCtx)
980+
go rest (result <> Builder.fromText replacement)) (ctx <> newCtx)
982981
where
983982
replacement = stringIgnoreContext replacementNS
984983
newCtx = NixString.getContext replacementNS

0 commit comments

Comments
 (0)