hasufell
/
ghcup-hs
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename lots of modules

This commit is contained in:
Julian Ospald 2021-11-05 22:57:15 +01:00
parent 34910f853b
commit 7f542646dd
Signed by: hasufell
GPG Key ID: 3786C5262ECB4A3F
41 changed files with 130 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/ghcup/BrickMain.hs
View File

@ -13,8 +13,8 @@ import GHCup.Errors
import GHCup.Types.Optics ( getDirs ) import GHCup.Types.Optics ( getDirs )
import GHCup.Types hiding ( LeanAppState(..) ) import GHCup.Types hiding ( LeanAppState(..) )
import GHCup.Utils import GHCup.Utils
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.Prelude ( decUTF8Safe ) import GHCup.Prelude ( decUTF8Safe )
import GHCup.System.Process import GHCup.System.Process
import Brick import Brick

6
app/ghcup/GHCup/OptParse/ChangeLog.hs
View File

@ -12,9 +12,9 @@ module GHCup.OptParse.ChangeLog where
import GHCup.Types import GHCup.Types
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.OptParse.Common import GHCup.OptParse.Common
import GHCup.Utils.String.QQ import GHCup.QQ.String
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail ) import Control.Monad.Fail ( MonadFail )
@ -34,7 +34,7 @@ import GHCup.Types.Optics
import GHCup.Utils import GHCup.Utils
import Data.Versions import Data.Versions
import URI.ByteString (serializeURIRef') import URI.ByteString (serializeURIRef')
import GHCup.Utils.Prelude import GHCup.Prelude
import GHCup.System.Process (exec) import GHCup.System.Process (exec)
import Data.Char (toLower) import Data.Char (toLower)

6
app/ghcup/GHCup/OptParse/Common.hs
View File

@ -14,9 +14,9 @@ import GHCup.Platform
import GHCup.Types import GHCup.Types
import GHCup.Types.Optics import GHCup.Types.Optics
import GHCup.Utils import GHCup.Utils
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.MegaParsec import GHCup.MegaParsec
import GHCup.Utils.Prelude import GHCup.Prelude
import Control.Exception.Safe import Control.Exception.Safe
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)

4
app/ghcup/GHCup/OptParse/Compile.hs
View File

@ -16,9 +16,9 @@ import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Types.Optics import GHCup.Types.Optics
import GHCup.Utils import GHCup.Utils
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.OptParse.Common import GHCup.OptParse.Common
import GHCup.Utils.String.QQ import GHCup.QQ.String
import GHCup.System.Process import GHCup.System.Process
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)

6
app/ghcup/GHCup/OptParse/Config.hs
View File

@ -14,9 +14,9 @@ module GHCup.OptParse.Config where
import GHCup.Errors import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Utils import GHCup.Utils
import GHCup.Utils.Prelude import GHCup.Prelude
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.String.QQ import GHCup.QQ.String
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail ) import Control.Monad.Fail ( MonadFail )

6
app/ghcup/GHCup/OptParse/DInfo.hs
View File

@ -17,9 +17,9 @@ import GHCup
import GHCup.Errors import GHCup.Errors
import GHCup.Version import GHCup.Version
import GHCup.Types import GHCup.Types
import GHCup.Utils.Prelude import GHCup.Prelude
import GHCup.Utils.Dirs import GHCup.Directories
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.System.Process import GHCup.System.Process
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)

4
app/ghcup/GHCup/OptParse/GC.hs
View File

@ -14,8 +14,8 @@ module GHCup.OptParse.GC where
import GHCup import GHCup
import GHCup.Errors import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.String.QQ import GHCup.QQ.String
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail ) import Control.Monad.Fail ( MonadFail )

4
app/ghcup/GHCup/OptParse/Install.hs
View File

@ -17,8 +17,8 @@ import GHCup.OptParse.Common
import GHCup import GHCup
import GHCup.Errors import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.String.QQ import GHCup.QQ.String
import GHCup.System.Process import GHCup.System.Process
import Codec.Archive import Codec.Archive

2
app/ghcup/GHCup/OptParse/List.hs
View File

@ -11,7 +11,7 @@ module GHCup.OptParse.List where
import GHCup import GHCup
import GHCup.Utils.Prelude import GHCup.Prelude
import GHCup.Types import GHCup.Types
import GHCup.OptParse.Common import GHCup.OptParse.Common

2
app/ghcup/GHCup/OptParse/Nuke.hs
View File

@ -14,7 +14,7 @@ module GHCup.OptParse.Nuke where
import GHCup import GHCup
import GHCup.Errors import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Utils.Logger import GHCup.Logger
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail ) import Control.Monad.Fail ( MonadFail )

6
app/ghcup/GHCup/OptParse/Prefetch.hs
View File

@ -14,9 +14,9 @@ module GHCup.OptParse.Prefetch where
import GHCup import GHCup
import GHCup.Errors import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.OptParse.Common import GHCup.OptParse.Common
import GHCup.Utils.String.QQ import GHCup.QQ.String
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail ) import Control.Monad.Fail ( MonadFail )
@ -33,7 +33,7 @@ import Text.PrettyPrint.HughesPJClass ( prettyShow )
import qualified Data.Text as T import qualified Data.Text as T
import Control.Exception.Safe (MonadMask) import Control.Exception.Safe (MonadMask)
import GHCup.Utils.Prelude import GHCup.Prelude
import GHCup.Download (getDownloadsF) import GHCup.Download (getDownloadsF)

4
app/ghcup/GHCup/OptParse/Rm.hs
View File

@ -18,9 +18,9 @@ import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Types.Optics import GHCup.Types.Optics
import GHCup.Utils import GHCup.Utils
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.OptParse.Common import GHCup.OptParse.Common
import GHCup.Utils.String.QQ import GHCup.QQ.String
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail ) import Control.Monad.Fail ( MonadFail )

4
app/ghcup/GHCup/OptParse/Set.hs
View File

@ -17,8 +17,8 @@ import GHCup.OptParse.Common
import GHCup import GHCup
import GHCup.Errors import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.String.QQ import GHCup.QQ.String
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail ) import Control.Monad.Fail ( MonadFail )

4
app/ghcup/GHCup/OptParse/ToolRequirements.hs
View File

@ -10,7 +10,7 @@ module GHCup.OptParse.ToolRequirements where
import GHCup.Errors import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Utils.Logger import GHCup.Logger
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail ) import Control.Monad.Fail ( MonadFail )
@ -28,7 +28,7 @@ import qualified Data.Text.IO as T
import Control.Exception.Safe (MonadMask) import Control.Exception.Safe (MonadMask)
import GHCup.Types.Optics import GHCup.Types.Optics
import GHCup.Platform import GHCup.Platform
import GHCup.Utils.Prelude import GHCup.Prelude
import GHCup.Requirements import GHCup.Requirements
import System.IO import System.IO

4
app/ghcup/GHCup/OptParse/UnSet.hs
View File

@ -16,8 +16,8 @@ module GHCup.OptParse.UnSet where
import GHCup import GHCup
import GHCup.Errors import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.String.QQ import GHCup.QQ.String
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail ) import Control.Monad.Fail ( MonadFail )

2
app/ghcup/GHCup/OptParse/Upgrade.hs
View File

@ -14,7 +14,7 @@ module GHCup.OptParse.Upgrade where
import GHCup import GHCup
import GHCup.Errors import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Utils.Logger import GHCup.Logger
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail ) import Control.Monad.Fail ( MonadFail )

4
app/ghcup/GHCup/OptParse/Whereis.hs
View File

@ -17,8 +17,8 @@ import GHCup
import GHCup.Errors import GHCup.Errors
import GHCup.OptParse.Common import GHCup.OptParse.Common
import GHCup.Types import GHCup.Types
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.String.QQ import GHCup.QQ.String
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail ) import Control.Monad.Fail ( MonadFail )

6
app/ghcup/Main.hs
View File

@ -21,9 +21,9 @@ import GHCup.Errors
import GHCup.Platform import GHCup.Platform
import GHCup.Types import GHCup.Types
import GHCup.Utils import GHCup.Utils
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.Prelude import GHCup.Prelude
import GHCup.Utils.String.QQ import GHCup.QQ.String
import GHCup.Version import GHCup.Version
import Cabal.Plan ( findPlanJson, SearchPlanJson(..) ) import Cabal.Plan ( findPlanJson, SearchPlanJson(..) )

23
ghcup.cabal
View File

@ -52,7 +52,7 @@ library
exposed-modules: exposed-modules:
GHCup GHCup
GHCup.Download GHCup.Download
GHCup.Download.Utils GHCup.Download.Common
GHCup.Errors GHCup.Errors
GHCup.Platform GHCup.Platform
GHCup.Requirements GHCup.Requirements
@ -60,15 +60,16 @@ library
GHCup.Types.JSON GHCup.Types.JSON
GHCup.Types.Optics GHCup.Types.Optics
GHCup.Utils GHCup.Utils
GHCup.Utils.Dirs GHCup.Directories
GHCup.System.Process GHCup.System.Process
GHCup.System.Directory GHCup.System.Directory
GHCup.System.Process.Common GHCup.System.Process.Common
GHCup.Utils.Logger GHCup.System.Console
GHCup.Utils.MegaParsec GHCup.Logger
GHCup.Utils.Prelude GHCup.MegaParsec
GHCup.Utils.String.QQ GHCup.Prelude
GHCup.Utils.Version.QQ GHCup.QQ.String
GHCup.QQ.Version
GHCup.Version GHCup.Version
hs-source-dirs: lib hs-source-dirs: lib
@ -154,8 +155,8 @@ library
cpp-options: -DIS_WINDOWS cpp-options: -DIS_WINDOWS
other-modules: other-modules:
GHCup.System.Process.Windows GHCup.System.Process.Windows
GHCup.Utils.Prelude.Windows GHCup.Prelude.Windows
GHCup.Utils.Windows GHCup.System.Console.Windows
build-depends: build-depends:
, bzlib , bzlib
@ -165,8 +166,8 @@ library
else else
other-modules: other-modules:
GHCup.System.Process.Posix GHCup.System.Process.Posix
GHCup.Utils.Posix GHCup.System.Console.Posix
GHCup.Utils.Prelude.Posix GHCup.Prelude.Posix
System.Console.Terminal.Common System.Console.Terminal.Common
System.Console.Terminal.Posix System.Console.Terminal.Posix

10
lib/GHCup.hs
View File

@ -33,10 +33,10 @@ import GHCup.Types
import GHCup.Types.JSON ( ) import GHCup.Types.JSON ( )
import GHCup.Types.Optics import GHCup.Types.Optics
import GHCup.Utils import GHCup.Utils
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.Prelude import GHCup.Prelude
import GHCup.Utils.String.QQ import GHCup.QQ.String
import GHCup.Utils.Version.QQ import GHCup.QQ.Version
import GHCup.Version import GHCup.Version
import GHCup.System.Directory import GHCup.System.Directory
import GHCup.System.Process import GHCup.System.Process
@ -96,7 +96,7 @@ import qualified Data.Text as T
import qualified Data.Text.IO as T import qualified Data.Text.IO as T
import qualified Data.Text.Encoding as E import qualified Data.Text.Encoding as E
import qualified Text.Megaparsec as MP import qualified Text.Megaparsec as MP
import GHCup.Utils.MegaParsec import GHCup.MegaParsec
import Control.Concurrent (threadDelay) import Control.Concurrent (threadDelay)

10
lib/GHCup/Utils/Dirs.hs → lib/GHCup/Directories.hs
View File

@ -5,7 +5,7 @@
{-# LANGUAGE ViewPatterns #-} {-# LANGUAGE ViewPatterns #-}
{-| {-|
Module : GHCup.Utils.Dirs Module : GHCup.Directories
Description : Definition of GHCup directories Description : Definition of GHCup directories
Copyright : (c) Julian Ospald, 2020 Copyright : (c) Julian Ospald, 2020
License : LGPL-3.0 License : LGPL-3.0
@ -13,7 +13,7 @@ Maintainer : hasufell@hasufell.de
Stability : experimental Stability : experimental
Portability : portable Portability : portable
-} -}
module GHCup.Utils.Dirs module GHCup.Directories
( getAllDirs ( getAllDirs
, ghcupBaseDir , ghcupBaseDir
, ghcupConfigFile , ghcupConfigFile
@ -35,9 +35,9 @@ import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Types.JSON ( ) import GHCup.Types.JSON ( )
import GHCup.Types.Optics import GHCup.Types.Optics
import GHCup.Utils.MegaParsec import GHCup.MegaParsec
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.Prelude import GHCup.Prelude
import Control.Exception.Safe import Control.Exception.Safe
import Control.Monad import Control.Monad

8
lib/GHCup/Download.hs
View File

@ -27,16 +27,16 @@ module GHCup.Download where
#if defined(INTERNAL_DOWNLOADER) #if defined(INTERNAL_DOWNLOADER)
import GHCup.Download.IOStreams import GHCup.Download.IOStreams
import GHCup.Download.Utils import GHCup.Download.Common
#endif #endif
import GHCup.Errors import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Types.Optics import GHCup.Types.Optics
import GHCup.Types.JSON ( ) import GHCup.Types.JSON ( )
import GHCup.Utils.Dirs import GHCup.Directories
import GHCup.System.Process import GHCup.System.Process
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.Prelude import GHCup.Prelude
import GHCup.Version import GHCup.Version
import Control.Applicative import Control.Applicative

4
lib/GHCup/Download/Utils.hs → lib/GHCup/Download/Common.hs
View File

@ -4,13 +4,13 @@
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilies #-}
module GHCup.Download.Utils where module GHCup.Download.Common where
import GHCup.Errors import GHCup.Errors
import GHCup.Types.Optics import GHCup.Types.Optics
import GHCup.Types.JSON ( ) import GHCup.Types.JSON ( )
import GHCup.Utils.Prelude import GHCup.Prelude
import Control.Applicative import Control.Applicative
import Control.Monad import Control.Monad

4
lib/GHCup/Download/IOStreams.hs
View File

@ -7,10 +7,10 @@
module GHCup.Download.IOStreams where module GHCup.Download.IOStreams where
import GHCup.Download.Utils import GHCup.Download.Common
import GHCup.Errors import GHCup.Errors
import GHCup.Types.JSON ( ) import GHCup.Types.JSON ( )
import GHCup.Utils.Prelude import GHCup.Prelude
import Control.Applicative import Control.Applicative
import Control.Exception.Safe import Control.Exception.Safe

8
lib/GHCup/Utils/Logger.hs → lib/GHCup/Logger.hs
View File

@ -4,7 +4,7 @@
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-| {-|
Module : GHCup.Utils.Logger Module : GHCup.Logger
Description : logger definition Description : logger definition
Copyright : (c) Julian Ospald, 2020 Copyright : (c) Julian Ospald, 2020
License : LGPL-3.0 License : LGPL-3.0
@ -14,12 +14,12 @@ Portability : portable
Here we define our main logger. Here we define our main logger.
-} -}
module GHCup.Utils.Logger where module GHCup.Logger where
import GHCup.Types import GHCup.Types
import GHCup.Types.Optics import GHCup.Types.Optics
import {-# SOURCE #-} GHCup.System.Directory import {-# SOURCE #-} GHCup.System.Directory
import GHCup.Utils.String.QQ import GHCup.QQ.String
import Control.Exception.Safe import Control.Exception.Safe
import Control.Monad import Control.Monad
@ -34,7 +34,7 @@ import System.IO.Error
import Text.Regex.Posix import Text.Regex.Posix
import qualified Data.ByteString as B import qualified Data.ByteString as B
import GHCup.Utils.Prelude import GHCup.Prelude
import qualified Data.Text as T import qualified Data.Text as T
logInfo :: ( MonadReader env m logInfo :: ( MonadReader env m

2
lib/GHCup/Utils/Logger.hs-boot → lib/GHCup/Logger.hs-boot
View File

@ -3,7 +3,7 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
module GHCup.Utils.Logger where module GHCup.Logger where
import GHCup.Types import GHCup.Types

4
lib/GHCup/Utils/MegaParsec.hs → lib/GHCup/MegaParsec.hs
View File

@ -2,7 +2,7 @@
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-| {-|
Module : GHCup.Utils.MegaParsec Module : GHCup.MegaParsec
Description : MegaParsec utilities Description : MegaParsec utilities
Copyright : (c) Julian Ospald, 2020 Copyright : (c) Julian Ospald, 2020
License : LGPL-3.0 License : LGPL-3.0
@ -10,7 +10,7 @@ Maintainer : hasufell@hasufell.de
Stability : experimental Stability : experimental
Portability : portable Portability : portable
-} -}
module GHCup.Utils.MegaParsec where module GHCup.MegaParsec where
import GHCup.Types import GHCup.Types

6
lib/GHCup/Platform.hs
View File

@ -24,9 +24,9 @@ import GHCup.Types
import GHCup.Types.Optics import GHCup.Types.Optics
import GHCup.Types.JSON ( ) import GHCup.Types.JSON ( )
import GHCup.System.Process import GHCup.System.Process
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.Prelude import GHCup.Prelude
import GHCup.Utils.String.QQ import GHCup.QQ.String
#if !MIN_VERSION_base(4,13,0) #if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail ) import Control.Monad.Fail ( MonadFail )

16
lib/GHCup/Utils/Prelude.hs → lib/GHCup/Prelude.hs
View File

@ -7,7 +7,7 @@
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE TypeOperators #-}
{-| {-|
Module : GHCup.Utils.Prelude Module : GHCup.Prelude
Description : MegaParsec utilities Description : MegaParsec utilities
Copyright : (c) Julian Ospald, 2020 Copyright : (c) Julian Ospald, 2020
License : LGPL-3.0 License : LGPL-3.0
@ -17,12 +17,12 @@ Portability : portable
GHCup specific prelude. Lots of Excepts functionality. GHCup specific prelude. Lots of Excepts functionality.
-} -}
module GHCup.Utils.Prelude module GHCup.Prelude
(module GHCup.Utils.Prelude, (module GHCup.Prelude,
#if defined(IS_WINDOWS) #if defined(IS_WINDOWS)
module GHCup.Utils.Prelude.Windows module GHCup.Prelude.Windows
#else #else
module GHCup.Utils.Prelude.Posix module GHCup.Prelude.Posix
#endif #endif
) )
where where
@ -30,11 +30,11 @@ where
import GHCup.Types import GHCup.Types
import GHCup.Errors import GHCup.Errors
import GHCup.Types.Optics import GHCup.Types.Optics
import {-# SOURCE #-} GHCup.Utils.Logger import {-# SOURCE #-} GHCup.Logger
#if defined(IS_WINDOWS) #if defined(IS_WINDOWS)
import GHCup.Utils.Prelude.Windows import GHCup.Prelude.Windows
#else #else
import GHCup.Utils.Prelude.Posix import GHCup.Prelude.Posix
#endif #endif
import Control.Applicative import Control.Applicative

2
lib/GHCup/Utils/Prelude/Posix.hs → lib/GHCup/Prelude/Posix.hs
View File

@ -1,4 +1,4 @@
module GHCup.Utils.Prelude.Posix where module GHCup.Prelude.Posix where
import System.Directory import System.Directory
import System.Posix.Files import System.Posix.Files

2
lib/GHCup/Utils/Prelude/Windows.hs → lib/GHCup/Prelude/Windows.hs
View File

@ -1,4 +1,4 @@
module GHCup.Utils.Prelude.Windows where module GHCup.Prelude.Windows where
import qualified System.Win32.File as Win32 import qualified System.Win32.File as Win32

4
lib/GHCup/Utils/String/QQ.hs → lib/GHCup/QQ/String.hs
View File

@ -1,7 +1,7 @@
{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TemplateHaskell #-}
{-| {-|
Module : GHCup.Utils.String.QQ Module : GHCup.QQ.String
Description : String quasi quoters Description : String quasi quoters
Copyright : (c) Audrey Tang <audreyt@audreyt.org> 2019, Julian Ospald <hasufell@posteo.de> 2020 Copyright : (c) Audrey Tang <audreyt@audreyt.org> 2019, Julian Ospald <hasufell@posteo.de> 2020
License : LGPL-3.0 License : LGPL-3.0
@ -30,7 +30,7 @@ Any instance of the IsString type is permitted.
(For GHC versions 6, write "[$s||]" instead of "[s||]".) (For GHC versions 6, write "[$s||]" instead of "[s||]".)
-} -}
module GHCup.Utils.String.QQ module GHCup.QQ.String
( s ( s
) )
where where

4
lib/GHCup/Utils/Version/QQ.hs → lib/GHCup/QQ/Version.hs
View File

@ -8,7 +8,7 @@
{-| {-|
Module : GHCup.Utils.Version.QQ Module : GHCup.QQ.Version
Description : Version quasi-quoters Description : Version quasi-quoters
Copyright : (c) Julian Ospald, 2020 Copyright : (c) Julian Ospald, 2020
License : LGPL-3.0 License : LGPL-3.0
@ -16,7 +16,7 @@ Maintainer : hasufell@hasufell.de
Stability : experimental Stability : experimental
Portability : portable Portability : portable
-} -}
module GHCup.Utils.Version.QQ where module GHCup.QQ.Version where
import Data.Data import Data.Data
import Data.Text ( Text ) import Data.Text ( Text )

16
lib/GHCup/System/Console.hs Normal file
View File

@ -0,0 +1,16 @@
{-# LANGUAGE CPP #-}
module GHCup.System.Console (
#if IS_WINDOWS
module GHCup.System.Console.Windows
#else
module GHCup.System.Console.Posix
#endif
) where
#if IS_WINDOWS
import GHCup.System.Console.Windows
#else
import GHCup.System.Console.Posix
#endif

2
lib/GHCup/Utils/Posix.hs → lib/GHCup/System/Console/Posix.hs
View File

@ -1,4 +1,4 @@
module GHCup.Utils.Posix where module GHCup.System.Console.Posix where
-- | Enables ANSI support on windows, does nothing on unix. -- | Enables ANSI support on windows, does nothing on unix.

2
lib/GHCup/Utils/Windows.hs → lib/GHCup/System/Console/Windows.hs
View File

@ -3,7 +3,7 @@
{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
module GHCup.Utils.Windows where module GHCup.System.Console.Windows where
import Control.Exception.Safe import Control.Exception.Safe

2
lib/GHCup/System/Directory.hs
View File

@ -5,7 +5,7 @@
module GHCup.System.Directory where module GHCup.System.Directory where
import GHCup.Utils.Prelude import GHCup.Prelude
import Control.Monad.Reader import Control.Monad.Reader
import Data.Maybe import Data.Maybe

4
lib/GHCup/System/Process/Posix.hs
View File

@ -15,8 +15,8 @@ Some of these functions use sophisticated logging.
-} -}
module GHCup.System.Process.Posix where module GHCup.System.Process.Posix where
import GHCup.Utils.Prelude import GHCup.Prelude
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Types import GHCup.Types
import GHCup.Types.Optics import GHCup.Types.Optics
import GHCup.System.Process.Common import GHCup.System.Process.Common

2
lib/GHCup/System/Process/Windows.hs
View File

@ -16,7 +16,7 @@ Some of these functions use sophisticated logging.
module GHCup.System.Process.Windows where module GHCup.System.Process.Windows where
import {-# SOURCE #-} GHCup.Utils ( getLinkTarget, pathIsLink ) import {-# SOURCE #-} GHCup.Utils ( getLinkTarget, pathIsLink )
import GHCup.Utils.Dirs import GHCup.Directories
import GHCup.Types import GHCup.Types
import GHCup.Types.Optics import GHCup.Types.Optics
import GHCup.System.Directory import GHCup.System.Directory

6
lib/GHCup/Types/JSON.hs
View File

@ -22,9 +22,9 @@ Portability : portable
module GHCup.Types.JSON where module GHCup.Types.JSON where
import GHCup.Types import GHCup.Types
import GHCup.Utils.MegaParsec import GHCup.MegaParsec
import GHCup.Utils.Prelude import GHCup.Prelude
import GHCup.Utils.Logger () -- TH is broken shite and needs GHCup.Utils.Logger for linking, although we don't depend on the file. import GHCup.Logger () -- TH is broken shite and needs GHCup.Logger for linking, although we don't depend on the file.
-- This is due to the boot file. -- This is due to the boot file.
import Control.Applicative ( (<|>) ) import Control.Applicative ( (<|>) )

24
lib/GHCup/Utils.hs
View File

@ -20,32 +20,32 @@ This module contains GHCup helpers specific to
installation and introspection of files/versions etc. installation and introspection of files/versions etc.
-} -}
module GHCup.Utils module GHCup.Utils
( module GHCup.Utils.Dirs ( module GHCup.Directories
, module GHCup.Utils , module GHCup.Utils
#if defined(IS_WINDOWS) #if defined(IS_WINDOWS)
, module GHCup.Utils.Windows , module GHCup.System.Console.Windows
#else #else
, module GHCup.Utils.Posix , module GHCup.System.Console.Posix
#endif #endif
) )
where where
#if defined(IS_WINDOWS) #if defined(IS_WINDOWS)
import GHCup.Utils.Windows import GHCup.System.Console.Windows
#else #else
import GHCup.Utils.Posix import GHCup.System.Console.Posix
#endif #endif
import GHCup.Download import GHCup.Download
import GHCup.Errors import GHCup.Errors
import GHCup.Types import GHCup.Types
import GHCup.Types.Optics import GHCup.Types.Optics
import GHCup.Types.JSON ( ) import GHCup.Types.JSON ( )
import GHCup.Utils.Dirs import GHCup.Directories
import GHCup.Utils.Logger import GHCup.Logger
import GHCup.Utils.MegaParsec import GHCup.MegaParsec
import GHCup.Utils.Prelude import GHCup.Prelude
import GHCup.Utils.String.QQ import GHCup.QQ.String
import GHCup.System.Directory import GHCup.System.Directory
import GHCup.System.Process import GHCup.System.Process
@ -98,14 +98,14 @@ import qualified Data.List.NonEmpty as NE
-- >>> import System.Directory -- >>> import System.Directory
-- >>> import URI.ByteString -- >>> import URI.ByteString
-- >>> import qualified Data.Text as T -- >>> import qualified Data.Text as T
-- >>> import GHCup.Utils.Prelude -- >>> import GHCup.Prelude
-- >>> import GHCup.Download -- >>> import GHCup.Download
-- >>> import GHCup.Version -- >>> import GHCup.Version
-- >>> import GHCup.Errors -- >>> import GHCup.Errors
-- >>> import GHCup.Types -- >>> import GHCup.Types
-- >>> import GHCup.Types.Optics -- >>> import GHCup.Types.Optics
-- >>> import Optics -- >>> import Optics
-- >>> import GHCup.Utils.Version.QQ -- >>> import GHCup.QQ.Version
-- >>> import qualified Data.Text.Encoding as E -- >>> import qualified Data.Text.Encoding as E
-- >>> import Control.Monad.Reader -- >>> import Control.Monad.Reader
-- >>> import Haskus.Utils.Variant.Excepts -- >>> import Haskus.Utils.Variant.Excepts