Skip to content

Commit

Permalink
Merge pull request #210 from Boarders/unqualified-list-warning
Browse files Browse the repository at this point in the history
Use qualified import on Data.List
  • Loading branch information
snoyberg authored Feb 9, 2023
2 parents 35fe989 + db1e2f0 commit 02e49d6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions yaml/src/Data/Yaml/Internal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import qualified Data.ByteString.Builder as BB
import qualified Data.ByteString.Lazy as BL
import Data.ByteString.Builder.Scientific (scientificBuilder)
import Data.Char (toUpper, ord)
import Data.List
import qualified Data.List as List
import Data.Conduit ((.|), ConduitM, runConduit)
import qualified Data.Conduit.List as CL
import qualified Data.HashSet as HashSet
Expand Down Expand Up @@ -314,14 +314,14 @@ parseM mergedKeys a front = do
if s == "<<"
then case o of
Object l -> return (merge l)
Array l -> return $ merge $ foldl' mergeObjects M.empty $ V.toList l
Array l -> return $ merge $ List.foldl' mergeObjects M.empty $ V.toList l
_ -> al
else al
parseM mergedKeys' a al'
where mergeObjects al (Object om) = M.union al om
mergeObjects al _ = al

merge xs = (Set.fromList (M.keys xs \\ M.keys front), M.union front xs)
merge xs = (Set.fromList (M.keys xs List.\\ M.keys front), M.union front xs)

parseSrc :: ReaderT JSONPath (ConduitM Event Void Parse) val
-> ConduitM () Event Parse ()
Expand Down

0 comments on commit 02e49d6

Please sign in to comment.