Skip to content

Commit 07caac2

Browse files
committed
treewide: (HashMap.union->(<>))
1 parent c118b5e commit 07caac2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

main/Repl.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ exec update source = do
225225

226226
-- If the result value is a set, update our context with it
227227
case val of
228-
NVSet xs _ -> put st { replCtx = Data.HashMap.Lazy.union xs (replCtx st) }
228+
NVSet xs _ -> put st { replCtx = xs <> replCtx st }
229229
_ -> pass
230230

231231
pure $ pure val

src/Nix/Exec.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ execBinaryOpForced scope span op lval rval = case op of
408408

409409
NUpdate ->
410410
case (lval, rval) of
411-
(NVSet ls lp, NVSet rs rp) -> pure $ nvSetP prov (rp `M.union` lp) (rs `M.union` ls)
411+
(NVSet ls lp, NVSet rs rp) -> pure $ nvSetP prov (rp <> lp) (rs <> ls)
412412
(NVSet ls lp, NVConstant NNull) -> pure $ nvSetP prov lp ls
413413
(NVConstant NNull, NVSet rs rp) -> pure $ nvSetP prov rp rs
414414
_ -> unsupportedTypes

0 commit comments

Comments
 (0)