3ab1f60 · elk · git.iko.soy

builder/src/Deps/Explorer.hs+1−1

compare with master

unifiedsplit

@@ -28,7 +28,7 @@ import Elm.Package (Name, Version)

28import qualified Deps.Get as Get

29import qualified Elm.Project.Json as Project

30import Elm.Project.Constraint (Constraint)

31−import qualified Reporting.Error as Error

31+import qualified Reporting.Error2 as Error

32import qualified Reporting.Error.Deps as E

33import qualified Reporting.Task as Task

34

builder/src/Deps/Get.hs+1−1

@@ -28,7 +28,7 @@ import qualified Deps.Website as Website

28import qualified Elm.Project.Json as Project

29import qualified Elm.Utils as Utils

30import qualified File.IO as IO

31−import qualified Reporting.Error as Error

31+import qualified Reporting.Error2 as Error

32import qualified Reporting.Error.Assets as E

33import qualified Reporting.Progress as Progress

34import qualified Reporting.Task as Task

builder/src/Deps/Verify.hs+1−1

@@ -36,7 +36,7 @@ import qualified File.Compile as Compile

36import qualified File.Crawl as Crawl

37import qualified File.IO as IO

38import qualified File.Plan as Plan

39−import qualified Reporting.Error as Error

39+import qualified Reporting.Error2 as Error

40import qualified Reporting.Error.Deps as E

41import qualified Reporting.Progress as Progress

42import qualified Reporting.Task as Task

builder/src/Elm/Bump.hs+1−1

@@ -18,7 +18,7 @@ import qualified Elm.Package as Pkg

18import qualified Elm.Project as Project

19import qualified Elm.Project.Json as Project

20import qualified Elm.Project.Summary as Summary

21−import qualified Reporting.Error as Error

21+import qualified Reporting.Error2 as Error

22import qualified Reporting.Error.Bump as E

23import qualified Reporting.Error.Help as Help

24import qualified Reporting.Progress.Terminal as Terminal

builder/src/Elm/Diff.hs+1−1

@@ -25,7 +25,7 @@ import qualified Elm.Package as Pkg

25import qualified Elm.Project as Project

26import qualified Elm.Project.Json as Project

27import qualified Elm.Project.Summary as Summary

28−import qualified Reporting.Error as Error

28+import qualified Reporting.Error2 as Error

29import qualified Reporting.Error.Diff as E

30import qualified Reporting.Error.Help as Help

31import qualified Reporting.Task as Task

builder/src/Elm/Install.hs+1−1

@@ -24,7 +24,7 @@ import Elm.Project.Constraint (Constraint)

24import qualified Elm.Project.Constraint as Con

25import qualified Elm.Project.Json as Project

26import qualified Elm.Project.Root as Root

27−import qualified Reporting.Error as Error

27+import qualified Reporting.Error2 as Error

28import qualified Reporting.Task as Task

29

30

builder/src/Elm/Project/Json.hs+1−1

@@ -41,7 +41,7 @@ import qualified Elm.Project.Constraint as Con

41import qualified Elm.Project.Licenses as Licenses

42import qualified Json.Decode as D

43import qualified Json.Encode as E

44−import qualified Reporting.Error as Error

44+import qualified Reporting.Error2 as Error

45import qualified Reporting.Error.Assets as E

46import qualified Reporting.Task as Task

47

builder/src/Elm/Project/Licenses.hs+1−1

@@ -180,4 +180,4 @@ osiApprovedSpdxLicenses =

180 , "Xnet" ==> "X.Net License"

181 , "Zlib" ==> "zlib License"

182 , "ZPL-2.0" ==> "Zope Public License 2.0"

183− ]

183+ ]

builder/src/Elm/Project/Root.hs+1−1

@@ -20,7 +20,7 @@ import Elm.Project.Json (Project(..), PkgInfo(..))

20import Elm.Project.Summary (Summary)

21import qualified Elm.PerUserCache as PerUserCache

22import qualified File.IO as IO

23−import qualified Reporting.Error as Error

23+import qualified Reporting.Error2 as Error

24import qualified Reporting.Task as Task

25import qualified Stuff.Verify as Verify

26import qualified Json.Encode as Encode

builder/src/Elm/Publish.hs+1−1

@@ -22,7 +22,7 @@ import qualified Elm.Package as Pkg

22import qualified Elm.Project as Project

23import qualified Elm.Project.Json as Project

24import qualified Elm.Project.Summary as Summary

25−import qualified Reporting.Error as Error

25+import qualified Reporting.Error2 as Error

26import qualified Reporting.Error.Publish as E

27import qualified Reporting.Progress as Progress

28import qualified Reporting.Task as Task

builder/src/File/Args.hs+1−1

@@ -11,7 +11,7 @@ import Data.List.NonEmpty (NonEmpty((:|)))

11import qualified Elm.Compiler.Module as Module

12import qualified Elm.Project.Json as Project

13import qualified Elm.Project.Summary as Summary

14−import qualified Reporting.Error as Error

14+import qualified Reporting.Error2 as Error

15import qualified Reporting.Task as Task

16

17

builder/src/File/Artifacts.hs+1−1

@@ -25,7 +25,7 @@ import qualified Json.Encode as Encode

25

26import File.Compile (Answer(..))

27import qualified Reporting.Error.Compile as E

28−import qualified Reporting.Error as Error

28+import qualified Reporting.Error2 as Error

29import qualified Reporting.Task as Task

30import qualified Stuff.Paths as Path

31

builder/src/File/Crawl.hs+1−1

@@ -29,7 +29,7 @@ import qualified File.Args as Args

29import qualified File.Find as Find

30import qualified File.Header as Header

31import qualified File.IO as IO

32−import qualified Reporting.Error as Error

32+import qualified Reporting.Error2 as Error

33import qualified Reporting.Error.Crawl as E

34import qualified Reporting.Task as Task

35

builder/src/File/Header.hs+1−1

@@ -25,7 +25,7 @@ import qualified Elm.Project.Json as Project

25import Elm.Project.Json (Project)

26import Elm.Project.Summary (Summary(..))

27import qualified File.IO as IO

28−import qualified Reporting.Error as Error

28+import qualified Reporting.Error2 as Error

29import qualified Reporting.Error.Crawl as E

30import qualified Reporting.Task as Task

31

builder/src/File/IO.hs+1−1

@@ -30,7 +30,7 @@ import qualified System.FilePath as FP

30import qualified System.IO as IO

31import System.IO.Error (ioeGetErrorType, annotateIOError, modifyIOError)

32

33−import qualified Reporting.Error as Error

33+import qualified Reporting.Error2 as Error

34import qualified Reporting.Error.Assets as E

35import qualified Reporting.Task as Task

36

builder/src/Reporting/Error.hs → builder/src/Reporting/Error2.hsrenamed+1−1

@@ -1,6 +1,6 @@

1{-# OPTIONS_GHC -Wall #-}

2{-# LANGUAGE OverloadedStrings #-}

3−module Reporting.Error

3+module Reporting.Error2

4 ( Error(..)

5 , toString

6 , toStderr

builder/src/Reporting/Progress.hs+1−1

@@ -16,7 +16,7 @@ import Control.Concurrent.MVar (MVar, readMVar)

16import qualified Elm.Compiler.Module as Module

17import Deps.Diff (Magnitude)

18import Elm.Package (Name, Version)

19−import Reporting.Error (Error)

19+import Reporting.Error2 (Error)

20

21

22

builder/src/Reporting/Progress/Repl.hs+1−1

@@ -9,7 +9,7 @@ import Control.Concurrent (forkIO)

9import Control.Concurrent.Chan (Chan, newChan, readChan)

10import Control.Concurrent.MVar (newEmptyMVar, putMVar)

11

12−import qualified Reporting.Error as Error

12+import qualified Reporting.Error2 as Error

13import qualified Reporting.Progress as Progress

14

15

builder/src/Reporting/Progress/Terminal.hs+1−1

@@ -17,7 +17,7 @@ import qualified Elm.Package as Pkg

17import Elm.Package (Name, Version)

18

19import qualified Deps.Diff as Diff

20−import qualified Reporting.Error as Error

20+import qualified Reporting.Error2 as Error

21import qualified Reporting.Error.Help as Help

22import Reporting.Progress (Msg(..), Progress(..), Outcome(..), PublishPhase(..), BumpPhase(..))

23import qualified Reporting.Progress as Progress

builder/src/Reporting/Task.hs+1−1

@@ -31,7 +31,7 @@ import qualified System.IO as IO

31import Elm.Package (Name, Version)

32import qualified Elm.Package as Pkg

33import qualified Elm.PerUserCache as PerUserCache

34−import qualified Reporting.Error as Error

34+import qualified Reporting.Error2 as Error

35import qualified Reporting.Progress as Progress

36

37

builder/src/Reporting/Task/Http.hs+1−1

@@ -24,7 +24,7 @@ import qualified Network.HTTP.Client as Http

24

25import qualified Elm.Compiler as Compiler

26import qualified Elm.Package as Pkg

27−import qualified Reporting.Error as Error

27+import qualified Reporting.Error2 as Error

28import qualified Reporting.Error.Http as E

29import qualified Reporting.Progress as Progress

30import qualified Reporting.Task as Task