treewide: sequnce(->A)

Author: Anton-Latukha

src/Nix/Builtins.hs

@@ -1770,7 +1770,7 @@ langVersionNix = toValue (5 :: Int)
 -- ** @builtinsList@
 
 builtinsList :: forall e t f m . MonadNix e t f m => m [Builtin (NValue t f m)]
-builtinsList = sequence
+builtinsList = sequenceA
   [ add0 Normal   "nixVersion"       nixVersionNix
   , add0 Normal   "langVersion"      langVersionNix
   , add  TopLevel "abort"            throwNix -- for now

src/Nix/Convert.hs

@@ -277,7 +277,7 @@ instance ( Convertible e t f m
   => FromValue [a] m (Deeper (NValue' t f m (NValue t f m))) where
   fromValueMay =
     \case
-      Deeper (NVList' l) -> sequence <$> traverse fromValueMay l
+      Deeper (NVList' l) -> sequenceA <$> traverse fromValueMay l
       _                  -> stub
 
 
@@ -301,7 +301,7 @@ instance ( Convertible e t f m
 
   fromValueMay =
     \case
-      Deeper (NVSet' _ s) -> sequence <$> traverse fromValueMay s
+      Deeper (NVSet' _ s) -> sequenceA <$> traverse fromValueMay s
       _                   -> stub
 
   fromValue = fromMayToDeeperValue TSet
@@ -326,7 +326,7 @@ instance ( Convertible e t f m
 
   fromValueMay =
     \case
-      Deeper (NVSet' p s) -> fmap (, p) . sequence <$> traverse fromValueMay s
+      Deeper (NVSet' p s) -> fmap (, p) . sequenceA <$> traverse fromValueMay s
       _                   -> stub
 
   fromValue = fromMayToDeeperValue TSet

src/Nix/Effects/Derivation.hs

@@ -272,7 +272,7 @@ defaultDerivationStrict val = do
                     (Map.keys $ outputs drv)
                 )
           }
-        outputs' <- sequence $ Map.mapWithKey (\o _ -> makeOutputPath o hash drvName) $ outputs drv
+        outputs' <- sequenceA $ Map.mapWithKey (\o _ -> makeOutputPath o hash drvName) $ outputs drv
         pure $ drv
           { inputs
           , outputs = outputs'

src/Nix/Eval.hs

@@ -244,7 +244,7 @@ attrSetAlter (k : ks) pos m p val =
     (\(st', _) ->
       (M.insert
         k
-        (toValue @(AttrSet v, PositionSet) =<< (, mempty) <$> sequence st')
+        (toValue @(AttrSet v, PositionSet) =<< (, mempty) <$> sequenceA st')
         m
       , M.insert (coerce k) pos p
       )
@@ -465,7 +465,7 @@ assembleString
   -> m (Maybe NixString)
 assembleString = fromParts . stringParts
  where
-  fromParts xs = (mconcat <$>) . sequence <$> traverse go xs
+  fromParts xs = (mconcat <$>) . sequenceA <$> traverse go xs
   go =
     runAntiquoted
       "\n"

src/Nix/Exec.hs

@@ -500,7 +500,7 @@ addTracing k v = do
   depth <- ask
   guard $ depth < 2000
   local succ $ do
-    v'@(AnnF span x) <- sequence v
+    v'@(AnnF span x) <- sequenceA v
     pure $ do
       opts :: Options <- asks $ view hasLens
       let

src/Nix/Reduce.hs

@@ -204,7 +204,7 @@ reduce (NBinaryAnnF bann op larg rarg) =
 --   3. The selected AttrPath exists in the set.
 reduce base@(NSelectAnnF _ _ _ attrs)
   | sAttrPath $ NE.toList attrs = do
-    (NSelectAnnF _ _ aset attrs) <- sequence base
+    (NSelectAnnF _ _ aset attrs) <- sequenceA base
     inspectSet (unFix aset) attrs
   | otherwise = sId
  where
@@ -242,14 +242,14 @@ reduce e@(NSetAnnF ann NonRecursive binds) =
           binds
 
     bool
-      (clearScopes @NExprLoc $ NSetAnn ann mempty <$> traverse sequence binds)
       (reduceLayer e)
+      (clearScopes @NExprLoc $ NSetAnn ann mempty <$> traverse sequenceA binds)
       usesInherit
 
 -- Encountering a 'rec set' construction eliminates any hope of inlining
 -- definitions.
 reduce (NSetAnnF ann Recursive binds) =
-  clearScopes @NExprLoc $ NSetAnn ann Recursive <$> traverse sequence binds
+  clearScopes @NExprLoc $ NSetAnn ann Recursive <$> traverse sequenceA binds
 
 -- Encountering a 'with' construction eliminates any hope of inlining
 -- definitions.
@@ -260,7 +260,7 @@ reduce (NWithAnnF ann scope body) =
 --   constants and strings to the body scope.
 reduce (NLetAnnF ann binds body) =
   do
-    binds' <- traverse sequence binds
+    binds' <- traverse sequenceA binds
     body'  <-
       (`pushScope` body) . coerce . HM.fromList . catMaybes =<<
         traverse
@@ -281,7 +281,7 @@ reduce (NLetAnnF ann binds body) =
           binds
 
     -- let names = gatherNames body'
-    -- binds' <- traverse sequence binds <&> \b -> flip filter b $ \case
+    -- binds' <- traverse sequenceA binds <&> \b -> flip filter b $ \case
     --     NamedVar (StaticKey name _ :| []) _ ->
     --         name `S.member` names
     --     _ -> True
@@ -307,11 +307,11 @@ reduce e@(NIfAnnF _ b t f) =
 reduce e@(NAssertAnnF _ b body) =
   (\case
     NConstantAnn _ (NBool b') | b' -> body
-    _ -> Fix <$> sequence e
+    _ -> reduceLayer e
   ) =<< b
 
 reduce (NAbsAnnF ann params body) = do
-  params' <- sequence params
+  params' <- sequenceA params
   -- Make sure that variable definitions in scope do not override function
   -- arguments.
   let
@@ -369,7 +369,7 @@ pruneTree opts =
     NSet recur binds -> pure $ NSet recur $
       bool
         (fromMaybe annNNull <<$>>)
-        (mapMaybe sequence)
+        (mapMaybe sequenceA)
         (reduceSets opts)  -- Reduce set members that aren't used; breaks if hasAttr is used
         binds
 
@@ -410,7 +410,7 @@ pruneTree opts =
     NIf _ Nothing (Just (Ann _ f)) -> pure f
     NIf _ (Just (Ann _ t)) Nothing -> pure t
 
-    x                     -> sequence x
+    x                     -> sequenceA x
 
   pruneString :: NString (Maybe NExprLoc) -> NString NExprLoc
   pruneString (DoubleQuoted xs) = DoubleQuoted $ mapMaybe pruneAntiquotedText xs

src/Nix/Render/Frame.hs

@@ -123,7 +123,7 @@ renderEvalFrame level f =
               "While calling builtins." <> pretty name
 
       SynHole synfo ->
-        sequence $
+        sequenceA $
           let e@(Ann ann _) = _synHoleInfo_expr synfo in
 
           [ renderLocation ann =<<

src/Nix/XML.hs

@@ -47,15 +47,15 @@ toXML = runWithStringContext . fmap pp . iterNValueByDiscardWith cyc phi
       mkEVal "string" . toString <$> extractNixString str
     NVList' l ->
       do
-        els <- sequence l
+        els <- sequenceA l
         pure $
           mkE
             "list"
             (Elem <$> els)
 
     NVSet' _ s ->
       do
-        kvs <- sequence s
+        kvs <- sequenceA s
         pure $
           mkE
             "attrs"