2ecbee3 · elk · git.iko.soy

compiler/src/AST/Canonical.hs+1−1

compare with master

unifiedsplit

@@ -62,9 +62,9 @@ import Data.Text (Text)

62import Data.Utf8 (Utf8)

63

64import qualified AST.Utils.Binop as Binop

65−import qualified AST.Module.Name as ModuleName

66import qualified AST.Utils.Shader as Shader

65import qualified AST.Utils.Shader as Shader

67import qualified Data.Index as Index

66import qualified Data.Index as Index

67+import qualified Elm.ModuleName as ModuleName

68import qualified Reporting.Annotation as A

69import qualified Reporting.Region as R

70

compiler/src/AST/Optimized.hs+1−1

@@ -29,8 +29,8 @@ import Data.Text (Text)

29import Data.Utf8 (Utf8)

30

31import qualified AST.Canonical as Can

32−import qualified AST.Module.Name as ModuleName

33import qualified Data.Index as Index

32import qualified Data.Index as Index

33+import qualified Elm.ModuleName as ModuleName

34import qualified Elm.Package as Pkg

35import qualified Optimize.DecisionTree as DT

36import qualified Reporting.Region as R

compiler/src/Canonicalize/Effects.hs+1−1

@@ -12,10 +12,10 @@ import qualified Data.Name as Name

12

13import qualified AST.Canonical as Can

14import qualified AST.Valid as Valid

15−import qualified AST.Module.Name as ModuleName

16import qualified AST.Utils.Type as Type

15import qualified AST.Utils.Type as Type

17import qualified Canonicalize.Environment as Env

16import qualified Canonicalize.Environment as Env

18import qualified Canonicalize.Type as Type

17import qualified Canonicalize.Type as Type

18+import qualified Elm.ModuleName as ModuleName

19import qualified Reporting.Annotation as A

20import qualified Reporting.Error.Canonicalize as Error

21import qualified Reporting.Region as R

compiler/src/Canonicalize/Environment.hs+1−1

@@ -25,8 +25,8 @@ import qualified Data.Name as Name

25

26import qualified AST.Utils.Binop as Binop

27import qualified AST.Canonical as Can

28−import qualified AST.Module.Name as ModuleName

29import qualified Data.Index as Index

28import qualified Data.Index as Index

29+import qualified Elm.ModuleName as ModuleName

30import qualified Reporting.Error.Canonicalize as Error

31import qualified Reporting.Region as R

32import qualified Reporting.Result as Result

compiler/src/Canonicalize/Environment/Foreign.hs+1−1

@@ -14,9 +14,9 @@ import qualified Data.Name as Name

14

15import qualified AST.Canonical as Can

16import qualified AST.Source as Src

17−import qualified AST.Module.Name as ModuleName

18import qualified Canonicalize.Environment as Env

17import qualified Canonicalize.Environment as Env

19import qualified Elm.Interface as I

18import qualified Elm.Interface as I

19+import qualified Elm.ModuleName as ModuleName

20import qualified Reporting.Annotation as A

21import qualified Reporting.Error.Canonicalize as Error

22import qualified Reporting.Result as Result

compiler/src/Canonicalize/Environment/Local.hs+1−1

@@ -15,11 +15,11 @@ import qualified Data.Name as Name

15import qualified AST.Canonical as Can

16import qualified AST.Source as Src

17import qualified AST.Valid as Valid

18−import qualified AST.Module.Name as ModuleName

19import qualified Canonicalize.Environment as Env

18import qualified Canonicalize.Environment as Env

20import qualified Canonicalize.Environment.Dups as Dups

19import qualified Canonicalize.Environment.Dups as Dups

21import qualified Canonicalize.Type as Type

20import qualified Canonicalize.Type as Type

22import qualified Data.Index as Index

21import qualified Data.Index as Index

22+import qualified Elm.ModuleName as ModuleName

23import qualified Reporting.Annotation as A

24import qualified Reporting.Error.Canonicalize as Error

25import qualified Reporting.Region as R

compiler/src/Canonicalize/Expression.hs+1−1

@@ -19,7 +19,6 @@ import qualified Data.Name as Name

19

20import qualified AST.Canonical as Can

21import qualified AST.Source as Src

22−import qualified AST.Module.Name as ModuleName

23import qualified AST.Utils.Binop as Binop

22import qualified AST.Utils.Binop as Binop

24import qualified AST.Utils.Type as Type

23import qualified AST.Utils.Type as Type

25import qualified AST.Valid as Valid

24import qualified AST.Valid as Valid

@@ -28,6 +27,7 @@ import qualified Canonicalize.Environment.Dups as Dups

28import qualified Canonicalize.Pattern as Pattern

27import qualified Canonicalize.Pattern as Pattern

29import qualified Canonicalize.Type as Type

28import qualified Canonicalize.Type as Type

30import qualified Data.Index as Index

29import qualified Data.Index as Index

30+import qualified Elm.ModuleName as ModuleName

31import qualified Elm.Package as Pkg

32import qualified Reporting.Annotation as A

33import qualified Reporting.Error.Canonicalize as Error

compiler/src/Canonicalize/Module.hs+1−1

@@ -12,7 +12,6 @@ import qualified Data.Name as Name

12import qualified AST.Canonical as Can

13import qualified AST.Source as Src

14import qualified AST.Valid as Valid

15−import qualified AST.Module.Name as ModuleName

16import qualified Canonicalize.Effects as Effects

15import qualified Canonicalize.Effects as Effects

17import qualified Canonicalize.Environment as Env

16import qualified Canonicalize.Environment as Env

18import qualified Canonicalize.Environment.Dups as Dups

17import qualified Canonicalize.Environment.Dups as Dups

@@ -23,6 +22,7 @@ import qualified Canonicalize.Pattern as Pattern

23import qualified Canonicalize.Type as Type

22import qualified Canonicalize.Type as Type

24import qualified Data.Index as Index

23import qualified Data.Index as Index

25import qualified Elm.Interface as I

24import qualified Elm.Interface as I

25+import qualified Elm.ModuleName as ModuleName

26import qualified Elm.Package as Pkg

27import qualified Reporting.Annotation as A

28import qualified Reporting.Error.Canonicalize as Error

compiler/src/Canonicalize/Pattern.hs+1−1

@@ -12,11 +12,11 @@ import qualified Data.Map.Strict as Map

12import qualified Data.Name as Name

13

14import qualified AST.Canonical as Can

15−import qualified AST.Module.Name as ModuleName

16import qualified AST.Source as Src

15import qualified AST.Source as Src

17import qualified Canonicalize.Environment as Env

16import qualified Canonicalize.Environment as Env

18import qualified Canonicalize.Environment.Dups as Dups

17import qualified Canonicalize.Environment.Dups as Dups

19import qualified Data.Index as Index

18import qualified Data.Index as Index

19+import qualified Elm.ModuleName as ModuleName

20import qualified Reporting.Annotation as A

21import qualified Reporting.Error.Canonicalize as Error

22import qualified Reporting.Region as R

compiler/src/Compile.hs+1−1

@@ -13,10 +13,10 @@ import qualified Data.Name as Name

13

14import qualified AST.Canonical as Can

15import qualified AST.Optimized as Opt

16−import qualified AST.Module.Name as ModuleName

17import qualified Canonicalize.Module as Canonicalize

16import qualified Canonicalize.Module as Canonicalize

18import qualified Elm.Docs as Docs

17import qualified Elm.Docs as Docs

19import qualified Elm.Interface as I

18import qualified Elm.Interface as I

19+import qualified Elm.ModuleName as ModuleName

20import qualified Elm.Package as Pkg

21import qualified Nitpick.PatternMatches as PatternMatches

22import qualified Optimize.Module as Optimize

compiler/src/Elm/Compiler.hs+5−4

@@ -17,8 +17,9 @@ import qualified Data.Map as Map

17import qualified Data.Text as Text

18

19import qualified Compile

20−import qualified Elm.Compiler.Module as M

21import qualified Elm.Compiler.Version

20import qualified Elm.Compiler.Version

21+import qualified Elm.Interface as I

22+import qualified Elm.ModuleName as ModuleName

22import qualified Elm.Package as Pkg

23import qualified Elm.Package as Pkg

23import qualified Json.Encode as Encode

24import qualified Json.Encode as Encode

24import qualified Reporting.Doc as D

25import qualified Reporting.Doc as D

@@ -46,8 +47,8 @@ version =

46compile

47compile

47 :: Compile.DocsFlag

48 :: Compile.DocsFlag

48 -> Pkg.Name

49 -> Pkg.Name

49− -> Map.Map M.Raw M.Canonical

50+ -> Map.Map ModuleName.Raw ModuleName.Canonical

50− -> M.Interfaces

51+ -> I.Interfaces

51 -> BS.ByteString

52 -> BS.ByteString

52 -> ( [Warning.Warning], Either [Error.Error] Compile.Artifacts )

53 -> ( [Warning.Warning], Either [Error.Error] Compile.Artifacts )

53compile docsFlag pkg importDict interfaces source =

54compile docsFlag pkg importDict interfaces source =

@@ -71,7 +72,7 @@ errorsToDoc filePath source errors =

71-- ERRORS TO JSON

72-- ERRORS TO JSON

72

73

74

74−errorsToJson :: M.Raw -> FilePath -> Text.Text -> [Error.Error] -> Encode.Value

75+errorsToJson :: ModuleName.Raw -> FilePath -> Text.Text -> [Error.Error] -> Encode.Value

75errorsToJson moduleName filePath source errors =

76errorsToJson moduleName filePath source errors =

76 let

77 let

77 reports =

78 reports =

compiler/src/Elm/Compiler/Imports.hs+14−14

@@ -9,7 +9,7 @@ module Elm.Compiler.Imports

9import qualified Data.Name as Name

10

11import qualified AST.Source as Src

12−import qualified AST.Module.Name as Module

12+import qualified Elm.ModuleName as ModuleName

13import qualified Elm.Package as Pkg

14import qualified Reporting.Annotation as A

15import qualified Reporting.Region as R

@@ -32,22 +32,22 @@ addDefaults pkgName imports =

32

33defaults :: [Src.Import]

34defaults =

35− [ import_ Module.basics Nothing Src.Open

35+ [ import_ ModuleName.basics Nothing Src.Open

36− , import_ Module.debug Nothing closed

36+ , import_ ModuleName.debug Nothing closed

37− , import_ Module.list Nothing (operator "::")

37+ , import_ ModuleName.list Nothing (operator "::")

38− , import_ Module.maybe Nothing (typeOpen Name.maybe)

38+ , import_ ModuleName.maybe Nothing (typeOpen Name.maybe)

39− , import_ Module.result Nothing (typeOpen Name.result)

39+ , import_ ModuleName.result Nothing (typeOpen Name.result)

40− , import_ Module.string Nothing (typeClosed Name.string)

40+ , import_ ModuleName.string Nothing (typeClosed Name.string)

41− , import_ Module.char Nothing (typeClosed Name.char)

41+ , import_ ModuleName.char Nothing (typeClosed Name.char)

42− , import_ Module.tuple Nothing closed

42+ , import_ ModuleName.tuple Nothing closed

43− , import_ Module.platform Nothing (typeClosed Name.program)

43+ , import_ ModuleName.platform Nothing (typeClosed Name.program)

44− , import_ Module.cmd (Just Name.cmd) (typeClosed Name.cmd)

44+ , import_ ModuleName.cmd (Just Name.cmd) (typeClosed Name.cmd)

45− , import_ Module.sub (Just Name.sub) (typeClosed Name.sub)

45+ , import_ ModuleName.sub (Just Name.sub) (typeClosed Name.sub)

46 ]

47

48

49−import_ :: Module.Canonical -> Maybe Name.Name -> Src.Exposing -> Src.Import

49+import_ :: ModuleName.Canonical -> Maybe Name.Name -> Src.Exposing -> Src.Import

50−import_ (Module.Canonical _ name) maybeAlias exposing =

50+import_ (ModuleName.Canonical _ name) maybeAlias exposing =

51 Src.Import (A.At R.zero name) maybeAlias exposing

52

53

compiler/src/Elm/Compiler/Objects.hs+1−1

@@ -18,7 +18,7 @@ import qualified Data.Map as Map

18import qualified Data.Name as Name

19

20import qualified AST.Optimized as Opt

21−import qualified AST.Module.Name as ModuleName

21+import qualified Elm.ModuleName as ModuleName

22import qualified Elm.Package as Pkg

23import qualified Generate.JavaScript as JS

24

compiler/src/Elm/Compiler/Type/Extract.hs+1−1

@@ -16,10 +16,10 @@ import qualified Data.Set as Set

16

17import qualified AST.Canonical as Can

18import qualified AST.Optimized as Opt

19−import qualified AST.Module.Name as ModuleName

20import qualified AST.Utils.Type as Type

19import qualified AST.Utils.Type as Type

21import qualified Elm.Compiler.Type as T

20import qualified Elm.Compiler.Type as T

22import qualified Elm.Interface as I

21import qualified Elm.Interface as I

22+import qualified Elm.ModuleName as ModuleName

23

24

25

compiler/src/Elm/Docs.hs+3−4

@@ -27,12 +27,11 @@ import qualified Data.Text as Text

27import qualified Data.Text.Encoding as Text

28

29import qualified AST.Canonical as Can

30−import qualified AST.Module.Name as ModuleName

31import qualified AST.Utils.Binop as Binop

30import qualified AST.Utils.Binop as Binop

32import qualified Data.OneOrMore as OneOrMore

31import qualified Data.OneOrMore as OneOrMore

33−import qualified Elm.Compiler.Module as Module

34import qualified Elm.Compiler.Type as Type

32import qualified Elm.Compiler.Type as Type

35import qualified Elm.Compiler.Type.Extract as Extract

33import qualified Elm.Compiler.Type.Extract as Extract

34+import qualified Elm.ModuleName as ModuleName

36import qualified Json.Decode as D

35import qualified Json.Decode as D

37import qualified Json.Encode as E

36import qualified Json.Encode as E

38import Json.Encode ((==>))

37import Json.Encode ((==>))

@@ -98,7 +97,7 @@ data Binop = Binop Comment Type.Type Binop.Associativity Binop.Precedence

98encode :: Module -> E.Value

97encode :: Module -> E.Value

99encode (Module name comment unions aliases values binops) =

98encode (Module name comment unions aliases values binops) =

100 E.object $

99 E.object $

101− [ "name" ==> Module.encode name

100+ [ "name" ==> ModuleName.encode name

102 , "comment" ==> E.text comment

101 , "comment" ==> E.text comment

103 , "unions" ==> E.list encodeUnion (Map.toList unions)

102 , "unions" ==> E.list encodeUnion (Map.toList unions)

104 , "aliases" ==> E.list encodeAlias (Map.toList aliases)

103 , "aliases" ==> E.list encodeAlias (Map.toList aliases)

@@ -138,7 +137,7 @@ named entryDecoder =

138

137

139nameDecoder :: D.Decoder Error Name.Name

138nameDecoder :: D.Decoder Error Name.Name

140nameDecoder =

139nameDecoder =

141− D.mapError (const BadName) Module.decoder

140+ D.mapError (const BadName) ModuleName.decoder

142

141

143

142

144typeDecoder :: D.Decoder Error Type.Type

143typeDecoder :: D.Decoder Error Type.Type

compiler/src/Elm/Header.hs+2−2

@@ -10,7 +10,7 @@ import qualified Data.ByteString as B

10import qualified Data.Name as Name

11

12import qualified AST.Source as Src

13−import qualified Elm.Compiler.Module as M

13+import qualified Elm.ModuleName as ModuleName

14import qualified Elm.Package as Pkg

15import qualified Parse.Primitives as Parser

16import qualified Parse.Module as Module

@@ -29,7 +29,7 @@ data Tag = Normal | Effect | Port

29-- PARSE

30

31

32−parse :: Pkg.Name -> B.ByteString -> Either Error.Error (Maybe (Tag, M.Raw), [M.Raw])

32+parse :: Pkg.Name -> B.ByteString -> Either Error.Error (Maybe (Tag, ModuleName.Raw), [ModuleName.Raw])

33parse pkgName sourceCode =

34 let

35 headerParser =

compiler/src/Elm/Interface.hs+1−1

@@ -22,8 +22,8 @@ import qualified Data.Map.Merge.Strict as Map

22import qualified Data.Name as Name

23

24import qualified AST.Canonical as Can

25−import qualified AST.Module.Name as ModuleName

26import qualified AST.Utils.Binop as Binop

25import qualified AST.Utils.Binop as Binop

26+import qualified Elm.ModuleName as ModuleName

27import qualified Reporting.Annotation as A

28

29

compiler/src/Elm/Kernel.hs+1−1

@@ -17,7 +17,7 @@ import Data.Word (Word8)

17

18import qualified AST.Optimized as Opt

19import qualified AST.Source as Src

20−import qualified AST.Module.Name as ModuleName

20+import qualified Elm.ModuleName as ModuleName

21import qualified Elm.Package as Pkg

22import Parse.Primitives (Parser, run)

23import qualified Parse.Primitives.Kernel as K

compiler/src/Generate/JavaScript.hs+1−1

@@ -20,9 +20,9 @@ import qualified Data.Text.Encoding as Text

20

21import qualified AST.Canonical as Can

22import qualified AST.Optimized as Opt

23−import qualified AST.Module.Name as ModuleName

24import qualified Data.Index as Index

23import qualified Data.Index as Index

25import qualified Elm.Interface as I

24import qualified Elm.Interface as I

25+import qualified Elm.ModuleName as ModuleName

26import qualified Generate.JavaScript.Builder as JS

27import qualified Generate.JavaScript.Expression as Expr

28import qualified Generate.JavaScript.Name as JsName

compiler/src/Generate/JavaScript/Expression.hs+2−2

@@ -23,12 +23,12 @@ import qualified Data.Utf8 as Utf8

23

24import qualified AST.Canonical as Can

25import qualified AST.Optimized as Opt

26−import qualified AST.Module.Name as ModuleName

27import qualified Data.Index as Index

26import qualified Data.Index as Index

28import qualified Elm.Compiler.Type as Type

27import qualified Elm.Compiler.Type as Type

29import qualified Elm.Compiler.Type.Extract as Extract

28import qualified Elm.Compiler.Type.Extract as Extract

30−import qualified Elm.Package as Pkg

31import qualified Elm.Compiler.Version as Version

29import qualified Elm.Compiler.Version as Version

30+import qualified Elm.ModuleName as ModuleName

31+import qualified Elm.Package as Pkg

32import qualified Generate.JavaScript.Builder as JS

33import qualified Generate.JavaScript.Mode as Mode

34import qualified Generate.JavaScript.Name as JsName

compiler/src/Generate/JavaScript/Name.hs+1−1

@@ -25,8 +25,8 @@ import qualified Data.Name as Name

25import qualified Data.Set as Set

26import Data.Word (Word8)

27

28−import qualified AST.Module.Name as ModuleName

29import qualified Data.Index as Index

28import qualified Data.Index as Index

29+import qualified Elm.ModuleName as ModuleName

30import qualified Elm.Package as Pkg

31

32

compiler/src/Nitpick/PatternMatches.hs+2−2

@@ -20,12 +20,12 @@ http://moscova.inria.fr/~maranget/papers/warn/warn.pdf

20import qualified Data.List as List

21import qualified Data.Map as Map

22import qualified Data.Maybe as Maybe

23+import qualified Data.Name as Name

23import Data.Utf8 (Utf8)

24import Data.Utf8 (Utf8)

24

25

25import qualified AST.Canonical as Can

26import qualified AST.Canonical as Can

26−import qualified AST.Module.Name as ModuleName

27import qualified Data.Index as Index

28−import qualified Data.Name as Name

28+import qualified Elm.ModuleName as ModuleName

29import qualified Reporting.Annotation as A

30import qualified Reporting.Region as R

31

compiler/src/Optimize/DecisionTree.hs+1−1

@@ -30,8 +30,8 @@ import qualified Data.Set as Set

30import Data.Utf8 (Utf8)

31

32import qualified AST.Canonical as Can

33−import qualified AST.Module.Name as ModuleName

34import qualified Data.Index as Index

33import qualified Data.Index as Index

34+import qualified Elm.ModuleName as ModuleName

35import qualified Reporting.Annotation as A

36

37

compiler/src/Optimize/Expression.hs+1−1

@@ -16,9 +16,9 @@ import qualified Data.Set as Set

16

17import qualified AST.Canonical as Can

18import qualified AST.Optimized as Opt

19−import qualified AST.Module.Name as ModuleName

20import qualified AST.Utils.Shader as Shader

19import qualified AST.Utils.Shader as Shader

21import qualified Data.Index as Index

20import qualified Data.Index as Index

21+import qualified Elm.ModuleName as ModuleName

22import qualified Optimize.Case as Case

23import qualified Optimize.Names as Names

24import qualified Reporting.Annotation as A

compiler/src/Optimize/Module.hs+1−1

@@ -16,9 +16,9 @@ import Data.Map ((!))

16

17import qualified AST.Canonical as Can

18import qualified AST.Optimized as Opt

19−import qualified AST.Module.Name as ModuleName

20import qualified AST.Utils.Type as Type

19import qualified AST.Utils.Type as Type

21import qualified Canonicalize.Effects as Effects

20import qualified Canonicalize.Effects as Effects

21+import qualified Elm.ModuleName as ModuleName

22import qualified Optimize.Expression as Expr

23import qualified Optimize.Names as Names

24import qualified Optimize.Port as Port

compiler/src/Optimize/Names.hs+1−1

@@ -22,8 +22,8 @@ import qualified Data.Set as Set

22

23import qualified AST.Canonical as Can

24import qualified AST.Optimized as Opt

25−import qualified AST.Module.Name as ModuleName

26import qualified Data.Index as Index

25import qualified Data.Index as Index

26+import qualified Elm.ModuleName as ModuleName

27import qualified Elm.Package as Pkg

28import qualified Reporting.Region as R

29

compiler/src/Optimize/Port.hs+1−1

@@ -15,9 +15,9 @@ import qualified Data.Name as Name

15

16import qualified AST.Canonical as Can

17import qualified AST.Optimized as Opt

18−import qualified AST.Module.Name as ModuleName

19import qualified AST.Utils.Type as Type

18import qualified AST.Utils.Type as Type

20import qualified Data.Index as Index

19import qualified Data.Index as Index

20+import qualified Elm.ModuleName as ModuleName

21import qualified Optimize.Names as Names

22

23

compiler/src/Reporting/Error/Canonicalize.hs+1−1

@@ -20,8 +20,8 @@ import qualified Data.Set as Set

20

21import qualified AST.Canonical as Can

22import qualified AST.Source as Src

23−import qualified AST.Module.Name as ModuleName

24import qualified Data.Index as Index

23import qualified Data.Index as Index

24+import qualified Elm.ModuleName as ModuleName

25import qualified Reporting.Annotation as A

26import qualified Reporting.Doc as D

27import Reporting.Doc (Doc, (<+>), (<>))

compiler/src/Reporting/Render/Type/Localizer.hs+1−1

@@ -18,9 +18,9 @@ import qualified Data.Name as Name

18import qualified Data.Set as Set

19

20import qualified AST.Source as Src

21−import qualified AST.Module.Name as ModuleName

22import qualified AST.Valid as Valid

21import qualified AST.Valid as Valid

23import qualified Elm.Compiler.Imports as Imports

22import qualified Elm.Compiler.Imports as Imports

23+import qualified Elm.ModuleName as ModuleName

24import qualified Elm.Package as Pkg

25import Reporting.Doc ((<>))

26import qualified Reporting.Doc as D

compiler/src/Type/Constrain/Expression.hs+1−1

@@ -11,9 +11,9 @@ import qualified Data.Map.Strict as Map

11import qualified Data.Name as Name

12

13import qualified AST.Canonical as Can

14−import qualified AST.Module.Name as ModuleName

15import qualified AST.Utils.Shader as Shader

14import qualified AST.Utils.Shader as Shader

16import qualified Data.Index as Index

15import qualified Data.Index as Index

16+import qualified Elm.ModuleName as ModuleName

17import qualified Reporting.Annotation as A

18import qualified Reporting.Error.Type as E

19import Reporting.Error.Type (Expected(..), Context(..), SubContext(..), MaybeName(..), Category(..), PExpected(..), PContext(..))

compiler/src/Type/Constrain/Module.hs+1−1

@@ -10,7 +10,7 @@ import qualified Data.Map.Strict as Map

10import qualified Data.Name as Name

11

12import qualified AST.Canonical as Can

13−import qualified AST.Module.Name as ModuleName

13+import qualified Elm.ModuleName as ModuleName

14import qualified Reporting.Annotation as A

15import qualified Reporting.Error.Type as E

16import qualified Reporting.Region as R

compiler/src/Type/Constrain/Pattern.hs+1−1

@@ -13,8 +13,8 @@ import qualified Data.Map.Strict as Map

13import qualified Data.Name as Name

14

15import qualified AST.Canonical as Can

16−import qualified AST.Module.Name as ModuleName

17import qualified Data.Index as Index

16import qualified Data.Index as Index

17+import qualified Elm.ModuleName as ModuleName

18import qualified Reporting.Annotation as A

19import qualified Reporting.Error.Type as E

20import qualified Reporting.Region as R

compiler/src/Type/Error.hs+1−1

@@ -23,8 +23,8 @@ import qualified Data.Maybe as Maybe

23import Data.Monoid ((<>))

24import qualified Data.Name as Name

25

26−import qualified AST.Module.Name as ModuleName

27import qualified Data.Bag as Bag

26import qualified Data.Bag as Bag

27+import qualified Elm.ModuleName as ModuleName

28import qualified Reporting.Doc as D

29import qualified Reporting.Render.Type as RT

30import qualified Reporting.Render.Type.Localizer as L

compiler/src/Type/Type.hs+1−1

@@ -37,8 +37,8 @@ import qualified Data.Name as Name

37import Data.Word (Word32)

38

39import qualified AST.Canonical as Can

40−import qualified AST.Module.Name as ModuleName

41import qualified AST.Utils.Type as Type

40import qualified AST.Utils.Type as Type

41+import qualified Elm.ModuleName as ModuleName

42import qualified Reporting.Annotation as A

43import qualified Reporting.Error.Type as E

44import qualified Reporting.Region as R

compiler/src/Type/Unify.hs+1−1

@@ -10,7 +10,7 @@ module Type.Unify

10import qualified Data.Map.Strict as Map

11import qualified Data.Name as Name

12

13−import qualified AST.Module.Name as ModuleName

13+import qualified Elm.ModuleName as ModuleName

14import qualified Type.Error as Error

15import qualified Type.Occurs as Occurs

16import Type.Type as Type