on master help sign in
Switch to using Imports.defaults directly / remove Imports.addDefaults
55d5d91Evan Czaplicki
compiler/src/Elm/Compiler/Imports.hs+1−10
@@ -1,7 +1,7 @@
1{-# OPTIONS_GHC -Wall #-}
1{-# OPTIONS_GHC -Wall #-}
2{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
3module Elm.Compiler.Imports
3module Elm.Compiler.Imports
4− ( addDefaults
4+ ( defaults
5 )
5 )
6 where
6 where
7
7
@@ -14,15 +14,6 @@ import qualified Reporting.Annotation as A
14
14
15
15
16
16
17−-- ADD DEFAULTS
18−
19−
20−addDefaults :: [Src.Import] -> [Src.Import]
21−addDefaults imports =
22− defaults ++ imports
23−
24−
25−
26-- DEFAULTS
17-- DEFAULTS
27
18
28
19
compiler/src/Reporting/Render/Type/Localizer.hs+2−2
@@ -93,7 +93,7 @@ fromNames names =
93
93
94
94
95fromModule :: Src.Module -> Localizer
95fromModule :: Src.Module -> Localizer
96−fromModule modul@(Src.Module _ _ imports _ _ _ _ _) =
96+fromModule modul@(Src.Module _ _ _ imports _ _ _ _ _) =
97 Localizer $ Map.fromList $
97 Localizer $ Map.fromList $
98 (Src.getName modul, Import Nothing All) : map toPair imports
98 (Src.getName modul, Import Nothing All) : map toPair imports
99
99
@@ -131,7 +131,7 @@ replEmpty :: Localizer
131replEmpty =
131replEmpty =
132 Localizer $
132 Localizer $
133 Map.insert Name.replModule (Import Nothing All) $
133 Map.insert Name.replModule (Import Nothing All) $
134− Map.fromList $ map toPair $ Imports.addDefaults []
134+ Map.fromList $ map toPair Imports.defaults
135
135
136
136
137replAdd :: Name.Name -> Maybe Name.Name -> Src.Exposing -> Localizer -> Localizer
137replAdd :: Name.Name -> Maybe Name.Name -> Src.Exposing -> Localizer -> Localizer