Resolve name clash with Reporting.Error module
Very surprised that .cabal allows duplicate module names!
commit3ab1f60c1429d3362db738c1352fecfc0ef4caea
authorEvan Czaplicki <evancz@users.noreply.github.com>
dateThu 22 Feb 2018, 11:05 (9 years ago)
parent9a72bcc
builder/src/Deps/Explorer.hs+1−1
@@ -28,7 +28,7 @@ import Elm.Package (Name, Version)
2828import qualified Deps.Get as Get
2929import qualified Elm.Project.Json as Project
3030import Elm.Project.Constraint (Constraint)
31−import qualified Reporting.Error as Error
31+import qualified Reporting.Error2 as Error
3232import qualified Reporting.Error.Deps as E
3333import qualified Reporting.Task as Task
3434
builder/src/Deps/Get.hs+1−1
@@ -28,7 +28,7 @@ import qualified Deps.Website as Website
2828import qualified Elm.Project.Json as Project
2929import qualified Elm.Utils as Utils
3030import qualified File.IO as IO
31−import qualified Reporting.Error as Error
31+import qualified Reporting.Error2 as Error
3232import qualified Reporting.Error.Assets as E
3333import qualified Reporting.Progress as Progress
3434import qualified Reporting.Task as Task
builder/src/Deps/Verify.hs+1−1
@@ -36,7 +36,7 @@ import qualified File.Compile as Compile
3636import qualified File.Crawl as Crawl
3737import qualified File.IO as IO
3838import qualified File.Plan as Plan
39−import qualified Reporting.Error as Error
39+import qualified Reporting.Error2 as Error
4040import qualified Reporting.Error.Deps as E
4141import qualified Reporting.Progress as Progress
4242import qualified Reporting.Task as Task
builder/src/Elm/Bump.hs+1−1
@@ -18,7 +18,7 @@ import qualified Elm.Package as Pkg
1818import qualified Elm.Project as Project
1919import qualified Elm.Project.Json as Project
2020import qualified Elm.Project.Summary as Summary
21−import qualified Reporting.Error as Error
21+import qualified Reporting.Error2 as Error
2222import qualified Reporting.Error.Bump as E
2323import qualified Reporting.Error.Help as Help
2424import qualified Reporting.Progress.Terminal as Terminal
builder/src/Elm/Diff.hs+1−1
@@ -25,7 +25,7 @@ import qualified Elm.Package as Pkg
2525import qualified Elm.Project as Project
2626import qualified Elm.Project.Json as Project
2727import qualified Elm.Project.Summary as Summary
28−import qualified Reporting.Error as Error
28+import qualified Reporting.Error2 as Error
2929import qualified Reporting.Error.Diff as E
3030import qualified Reporting.Error.Help as Help
3131import qualified Reporting.Task as Task
builder/src/Elm/Install.hs+1−1
@@ -24,7 +24,7 @@ import Elm.Project.Constraint (Constraint)
2424import qualified Elm.Project.Constraint as Con
2525import qualified Elm.Project.Json as Project
2626import qualified Elm.Project.Root as Root
27−import qualified Reporting.Error as Error
27+import qualified Reporting.Error2 as Error
2828import qualified Reporting.Task as Task
2929
3030
builder/src/Elm/Project/Json.hs+1−1
@@ -41,7 +41,7 @@ import qualified Elm.Project.Constraint as Con
4141import qualified Elm.Project.Licenses as Licenses
4242import qualified Json.Decode as D
4343import qualified Json.Encode as E
44−import qualified Reporting.Error as Error
44+import qualified Reporting.Error2 as Error
4545import qualified Reporting.Error.Assets as E
4646import qualified Reporting.Task as Task
4747
builder/src/Elm/Project/Licenses.hs+1−1
@@ -180,4 +180,4 @@ osiApprovedSpdxLicenses =
180180 , "Xnet" ==> "X.Net License"
181181 , "Zlib" ==> "zlib License"
182182 , "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(..))
2020import Elm.Project.Summary (Summary)
2121import qualified Elm.PerUserCache as PerUserCache
2222import qualified File.IO as IO
23−import qualified Reporting.Error as Error
23+import qualified Reporting.Error2 as Error
2424import qualified Reporting.Task as Task
2525import qualified Stuff.Verify as Verify
2626import qualified Json.Encode as Encode
builder/src/Elm/Publish.hs+1−1
@@ -22,7 +22,7 @@ import qualified Elm.Package as Pkg
2222import qualified Elm.Project as Project
2323import qualified Elm.Project.Json as Project
2424import qualified Elm.Project.Summary as Summary
25−import qualified Reporting.Error as Error
25+import qualified Reporting.Error2 as Error
2626import qualified Reporting.Error.Publish as E
2727import qualified Reporting.Progress as Progress
2828import qualified Reporting.Task as Task
builder/src/File/Args.hs+1−1
@@ -11,7 +11,7 @@ import Data.List.NonEmpty (NonEmpty((:|)))
1111import qualified Elm.Compiler.Module as Module
1212import qualified Elm.Project.Json as Project
1313import qualified Elm.Project.Summary as Summary
14−import qualified Reporting.Error as Error
14+import qualified Reporting.Error2 as Error
1515import qualified Reporting.Task as Task
1616
1717
builder/src/File/Artifacts.hs+1−1
@@ -25,7 +25,7 @@ import qualified Json.Encode as Encode
2525
2626import File.Compile (Answer(..))
2727import qualified Reporting.Error.Compile as E
28−import qualified Reporting.Error as Error
28+import qualified Reporting.Error2 as Error
2929import qualified Reporting.Task as Task
3030import qualified Stuff.Paths as Path
3131
builder/src/File/Crawl.hs+1−1
@@ -29,7 +29,7 @@ import qualified File.Args as Args
2929import qualified File.Find as Find
3030import qualified File.Header as Header
3131import qualified File.IO as IO
32−import qualified Reporting.Error as Error
32+import qualified Reporting.Error2 as Error
3333import qualified Reporting.Error.Crawl as E
3434import qualified Reporting.Task as Task
3535
builder/src/File/Header.hs+1−1
@@ -25,7 +25,7 @@ import qualified Elm.Project.Json as Project
2525import Elm.Project.Json (Project)
2626import Elm.Project.Summary (Summary(..))
2727import qualified File.IO as IO
28−import qualified Reporting.Error as Error
28+import qualified Reporting.Error2 as Error
2929import qualified Reporting.Error.Crawl as E
3030import qualified Reporting.Task as Task
3131
builder/src/File/IO.hs+1−1
@@ -30,7 +30,7 @@ import qualified System.FilePath as FP
3030import qualified System.IO as IO
3131import System.IO.Error (ioeGetErrorType, annotateIOError, modifyIOError)
3232
33−import qualified Reporting.Error as Error
33+import qualified Reporting.Error2 as Error
3434import qualified Reporting.Error.Assets as E
3535import qualified Reporting.Task as Task
3636
builder/src/Reporting/Error.hs → builder/src/Reporting/Error2.hsrenamed+1−1
@@ -1,6 +1,6 @@
11{-# OPTIONS_GHC -Wall #-}
22{-# LANGUAGE OverloadedStrings #-}
3−module Reporting.Error
3+module Reporting.Error2
44 ( Error(..)
55 , toString
66 , toStderr
builder/src/Reporting/Progress.hs+1−1
@@ -16,7 +16,7 @@ import Control.Concurrent.MVar (MVar, readMVar)
1616import qualified Elm.Compiler.Module as Module
1717import Deps.Diff (Magnitude)
1818import Elm.Package (Name, Version)
19−import Reporting.Error (Error)
19+import Reporting.Error2 (Error)
2020
2121
2222
builder/src/Reporting/Progress/Repl.hs+1−1
@@ -9,7 +9,7 @@ import Control.Concurrent (forkIO)
99import Control.Concurrent.Chan (Chan, newChan, readChan)
1010import Control.Concurrent.MVar (newEmptyMVar, putMVar)
1111
12−import qualified Reporting.Error as Error
12+import qualified Reporting.Error2 as Error
1313import qualified Reporting.Progress as Progress
1414
1515
builder/src/Reporting/Progress/Terminal.hs+1−1
@@ -17,7 +17,7 @@ import qualified Elm.Package as Pkg
1717import Elm.Package (Name, Version)
1818
1919import qualified Deps.Diff as Diff
20−import qualified Reporting.Error as Error
20+import qualified Reporting.Error2 as Error
2121import qualified Reporting.Error.Help as Help
2222import Reporting.Progress (Msg(..), Progress(..), Outcome(..), PublishPhase(..), BumpPhase(..))
2323import qualified Reporting.Progress as Progress
builder/src/Reporting/Task.hs+1−1
@@ -31,7 +31,7 @@ import qualified System.IO as IO
3131import Elm.Package (Name, Version)
3232import qualified Elm.Package as Pkg
3333import qualified Elm.PerUserCache as PerUserCache
34−import qualified Reporting.Error as Error
34+import qualified Reporting.Error2 as Error
3535import qualified Reporting.Progress as Progress
3636
3737
builder/src/Reporting/Task/Http.hs+1−1
@@ -24,7 +24,7 @@ import qualified Network.HTTP.Client as Http
2424
2525import qualified Elm.Compiler as Compiler
2626import qualified Elm.Package as Pkg
27−import qualified Reporting.Error as Error
27+import qualified Reporting.Error2 as Error
2828import qualified Reporting.Error.Http as E
2929import qualified Reporting.Progress as Progress
3030import qualified Reporting.Task as Task