diff options
| author | alexwl <alexey.a.kiryushin@gmail.com> | 2018-12-13 18:31:39 +0300 |
|---|---|---|
| committer | alexwl <alexey.a.kiryushin@gmail.com> | 2018-12-13 18:31:39 +0300 |
| commit | 27024fa57469af22d5b39309042f203c7b2efc5e (patch) | |
| tree | d5043e33da3c30be56b094c9c41092e1a7940f4b | |
| parent | 7488749af2408b6509776cfb54c150a834b55314 (diff) | |
Replace Vector.fromList with Vector.fromListN
Vector.fromListN allocates less memory and allows to remove the call to Vector.force before compaction ('compact $ Vector.fromList [1,2,3]' crashes, 'compact $ Vector.fromListN 3 [1,2,3]' doesn't crash)
| -rw-r--r-- | app/Server.hs | 12 | ||||
| -rw-r--r-- | src/HaskellCodeExplorer/Types.hs | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/app/Server.hs b/app/Server.hs index f6e1d6d..3bfebd8 100644 --- a/app/Server.hs +++ b/app/Server.hs @@ -374,15 +374,9 @@ loadPackageInfo config path = ( updateEachModuleInfo packageInfo (\modInfo -> - let source = - HCE.source :: HCE.CompactModuleInfo -> V.Vector T.Text - in if not enableExpressionInfo - then modInfo - { HCE.exprInfoMap = IVM.empty - , HCE.source = V.force $ source modInfo - -- 'force' fixes this error: Data.Vector.Mutable: uninitialised element CallStack (from HasCallStack): error, called at ./Data/Vector/Mutable.hs:188:17 in vector-0.12.0.1-GGZqQZyzchy8YFPCF67wxL:Data.Vector.Mutable - } - else modInfo {HCE.source = V.force $ source modInfo}) + if not enableExpressionInfo + then modInfo {HCE.exprInfoMap = IVM.empty} + else modInfo) , path) Left e -> return . Left $ (e, path) diff --git a/src/HaskellCodeExplorer/Types.hs b/src/HaskellCodeExplorer/Types.hs index f94b3af..a21a483 100644 --- a/src/HaskellCodeExplorer/Types.hs +++ b/src/HaskellCodeExplorer/Types.hs @@ -549,7 +549,7 @@ instance Serialize IdentifierOccurrenceSort instance Serialize TypeComponent instance (Serialize a) => Serialize (V.Vector a) where put = put . V.toList - get = V.fromList <$> get + get = (\l -> V.fromListN (L.length l) l) <$> get instance Serialize Type instance Serialize ExpressionInfo instance Serialize LocatableEntity |