From 2e9ba068c27adaf199cd8d14fc5fdd131f71d003 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sun, 22 Apr 2018 13:32:28 +0800 Subject: [PATCH] Sort import lists --- generate/src/Write/Module.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generate/src/Write/Module.hs b/generate/src/Write/Module.hs index a7d0ea62..14b5ae6b 100644 --- a/generate/src/Write/Module.hs +++ b/generate/src/Write/Module.hs @@ -136,10 +136,10 @@ isConstructor = \case moduleImports :: Module -> [Doc ()] moduleImports Module {..} = - let unqualifiedImportMap = Map.fromListWith + let unqualifiedImportMap = sort <$> Map.fromListWith union ((iModule &&& iImports) <$> [i | i@Import{} <- weImports =<< mWriteElements]) - qualifiedImportMap = Map.fromListWith + qualifiedImportMap = sort <$> Map.fromListWith union ((iModule &&& iImports) <$> [i | i@QualifiedImport{} <- weImports =<< mWriteElements]) makeImport :: Doc () -> (Text, [Text]) -> Doc () @@ -178,7 +178,7 @@ moduleInternalImports -> [Doc ()] moduleInternalImports nameModule Module {..} = let deps = simplifyDependencies (weDepends =<< mWriteElements) - depends = Map.fromListWith + depends = sort <$> Map.fromListWith (<>) [ ((m, g), [e]) | d <- deps