Skip to content

Commit 9828551

Browse files
author
theindigamer
committed
Remove needless .App prefixes everywhere.
1 parent bea81f7 commit 9828551

22 files changed

+80
-80
lines changed

‎Main.hs

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module Main where
2+
3+
import qualified Help.Ozil as Ozil
4+
5+
main :: IO ()
6+
main = Ozil.main

‎ozil.cabal

+16-16
Original file line numberDiff line numberDiff line change
@@ -88,29 +88,29 @@ library
8888
Help.Page.Man
8989
Help.Page.Man.Internal
9090
Help.Page.Man.Parse
91-
Help.Ozil.App
92-
Help.Ozil.App.Cmd
93-
Help.Ozil.App.Cmd.Parser
94-
Help.Ozil.App.Cmd.Types
95-
Help.Ozil.App.Config
96-
Help.Ozil.App.Config.Default
97-
Help.Ozil.App.Config.Types
98-
Help.Ozil.App.Config.Types.Core
99-
Help.Ozil.App.Config.Watch
100-
Help.Ozil.App.Console.Text
101-
Help.Ozil.App.Core
102-
Help.Ozil.App.Death
103-
Help.Ozil.App.KeyBinding
104-
Help.Ozil.App.Startup
105-
Help.Ozil.App.Startup.Core
91+
Help.Ozil
92+
Help.Ozil.Cmd
93+
Help.Ozil.Cmd.Parser
94+
Help.Ozil.Cmd.Types
95+
Help.Ozil.Config
96+
Help.Ozil.Config.Default
97+
Help.Ozil.Config.Types
98+
Help.Ozil.Config.Types.Core
99+
Help.Ozil.Config.Watch
100+
Help.Ozil.Console.Text
101+
Help.Ozil.Core
102+
Help.Ozil.Death
103+
Help.Ozil.KeyBinding
104+
Help.Ozil.Startup
105+
Help.Ozil.Startup.Core
106106
Help.Subcommand
107107
Syntax.RawString
108108
System.Man
109109
System.Man.Parser
110110
System.Man.Types
111111

112112
executable ozil
113-
main-is: ozil.hs
113+
main-is: Main.hs
114114
ghc-options: -threaded -rtsopts -with-rtsopts=-N
115115
build-depends: base, ozil
116116
default-language: Haskell2010

‎ozil.hs

-6
This file was deleted.

‎src/Help/Ozil/App.hs ‎src/Help/Ozil.hs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
module Help.Ozil.App where
1+
module Help.Ozil where
22

33
import Commons
44

5-
import Help.Ozil.App.Cmd
6-
import Help.Ozil.App.Core
5+
import Help.Ozil.Cmd
6+
import Help.Ozil.Core
77

8-
import Help.Ozil.App.Config (FSEvent, toReactOrNotToReact)
9-
import Help.Ozil.App.Startup (finishStartup)
8+
import Help.Ozil.Config (FSEvent, toReactOrNotToReact)
9+
import Help.Ozil.Startup (finishStartup)
1010
import Help.Page.Lenses (indents, anchors, tableIxs, helpPage)
1111

1212
import qualified Help.Page as Page
13-
import qualified Help.Ozil.App.Config.Default as Default
13+
import qualified Help.Ozil.Config.Default as Default
1414

1515
import Brick (App (..))
1616
import System.Directory (doesDirectoryExist)

‎src/Help/Ozil/Action.hs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module Help.Ozil.Action where

‎src/Help/Ozil/App/Action.hs

-1
This file was deleted.

‎src/Help/Ozil/App/Cmd.hs

-9
This file was deleted.

‎src/Help/Ozil/Cmd.hs

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-- TODO: Avoid exporting constructors?
2+
module Help.Ozil.Cmd
3+
( -- * Re-exports
4+
module Help.Ozil.Cmd.Parser
5+
, module Help.Ozil.Cmd.Types
6+
) where
7+
8+
import Help.Ozil.Cmd.Parser
9+
import Help.Ozil.Cmd.Types

‎src/Help/Ozil/App/Cmd/Parser.hs ‎src/Help/Ozil/Cmd/Parser.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
module Help.Ozil.App.Cmd.Parser
1+
module Help.Ozil.Cmd.Parser
22
( defaultMain
33
) where
44

55
import Commons
66

77
import Help.Subcommand (mkSubcommand)
8-
import Help.Ozil.App.Cmd.Types
8+
import Help.Ozil.Cmd.Types
99

1010
import Options.Applicative
1111

1212
import System.FilePath (isPathSeparator, takeExtension)
1313
import Text.Printf (printf)
1414

15-
import qualified Help.Ozil.App.Config.Default as Default
15+
import qualified Help.Ozil.Config.Default as Default
1616

1717
-- | Top-level runner
1818
defaultMain :: (Options -> IO b) -> IO b

‎src/Help/Ozil/App/Cmd/Types.hs ‎src/Help/Ozil/Cmd/Types.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{-# LANGUAGE TemplateHaskell #-}
22
{-# LANGUAGE FunctionalDependencies #-}
33

4-
module Help.Ozil.App.Cmd.Types
5-
( module Help.Ozil.App.Cmd.Types
4+
module Help.Ozil.Cmd.Types
5+
( module Help.Ozil.Cmd.Types
66
) where
77

88
import Commons

‎src/Help/Ozil/App/Config.hs ‎src/Help/Ozil/Config.hs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
{-# LANGUAGE RankNTypes #-}
22
{-# OPTIONS_GHC -Wno-unused-top-binds -Wno-redundant-constraints #-}
33

4-
module Help.Ozil.App.Config
4+
module Help.Ozil.Config
55
( getConfig
66
, saveConfig
7-
, module Help.Ozil.App.Config.Watch
7+
, module Help.Ozil.Config.Watch
88
, Conf.Config
99
)
1010
where
1111

1212
import Commons
1313

14-
import Help.Ozil.App.Config.Watch
15-
import Help.Ozil.App.Death
14+
import Help.Ozil.Config.Watch
15+
import Help.Ozil.Death
1616

17-
import Help.Ozil.App.Cmd (configPath, optCommand, Command (..), ConfigOptions (..))
18-
import Help.Ozil.App.Console.Text (warn, prompt, pattern DefaultYes)
19-
import Help.Ozil.App.Startup.Core (options, modifyConfig, Startup)
17+
import Help.Ozil.Cmd (configPath, optCommand, Command (..), ConfigOptions (..))
18+
import Help.Ozil.Console.Text (warn, prompt, pattern DefaultYes)
19+
import Help.Ozil.Startup.Core (options, modifyConfig, Startup)
2020

2121
import System.Directory
2222

@@ -26,8 +26,8 @@ import System.FilePath (takeDirectory)
2626

2727
import qualified Data.Text as T
2828
import qualified Data.ByteString as BS
29-
import qualified Help.Ozil.App.Config.Types as Conf
30-
import qualified Help.Ozil.App.Config.Default as Default
29+
import qualified Help.Ozil.Config.Types as Conf
30+
import qualified Help.Ozil.Config.Default as Default
3131

3232
-- TODO: Draw a state diagram of possible transitions and refactor helper
3333
-- functions appropriately. Right now, the linear flow is misleading, and

‎src/Help/Ozil/App/Config/Default.hs ‎src/Help/Ozil/Config/Default.hs

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
33
This module should be imported qualified.
44
-}
5-
module Help.Ozil.App.Config.Default where
5+
module Help.Ozil.Config.Default where
66

7-
import Help.Ozil.App.KeyBinding
8-
import Help.Ozil.App.Config.Types
9-
import Help.Ozil.App.Config.Types.Core
7+
import Help.Ozil.KeyBinding
8+
import Help.Ozil.Config.Types
9+
import Help.Ozil.Config.Types.Core
1010

1111
import Data.List.NonEmpty (NonEmpty (..))
1212
import Data.String (IsString)

‎src/Help/Ozil/App/Config/Types.hs ‎src/Help/Ozil/Config/Types.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
{-# LANGUAGE KindSignatures #-}
33
{-# LANGUAGE TemplateHaskell #-}
44

5-
module Help.Ozil.App.Config.Types
6-
( module Help.Ozil.App.Config.Types
5+
module Help.Ozil.Config.Types
6+
( module Help.Ozil.Config.Types
77
, KeyBindings
88
) where
99

1010
import Commons
11-
import Help.Ozil.App.Config.Types.Core
11+
import Help.Ozil.Config.Types.Core
1212

1313
import Lens.Micro (Lens')
1414
import Lens.Micro.TH (makeLenses)

‎src/Help/Ozil/App/Config/Types/Core.hs ‎src/Help/Ozil/Config/Types/Core.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{-# LANGUAGE DataKinds #-}
22
{-# LANGUAGE KindSignatures #-}
33

4-
module Help.Ozil.App.Config.Types.Core where
4+
module Help.Ozil.Config.Types.Core where
55

6-
import Help.Ozil.App.KeyBinding
6+
import Help.Ozil.KeyBinding
77

88
import Data.Aeson
99

‎src/Help/Ozil/App/Config/Watch.hs ‎src/Help/Ozil/Config/Watch.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Help.Ozil.App.Config.Watch
1+
module Help.Ozil.Config.Watch
22
( toReactOrNotToReact
33
, FSEvent
44
, module System.FSNotify
@@ -7,7 +7,7 @@ module Help.Ozil.App.Config.Watch
77

88
import System.FSNotify (WatchManager, Event (..), ActionPredicate)
99

10-
import qualified Help.Ozil.App.Config.Default as Default
10+
import qualified Help.Ozil.Config.Default as Default
1111

1212
type FSEvent = Event
1313

‎src/Help/Ozil/App/Console/Text.hs ‎src/Help/Ozil/Console/Text.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Help.Ozil.App.Console.Text
1+
module Help.Ozil.Console.Text
22
( warn
33
, prompt
44
, DefaultBool

‎src/Help/Ozil/App/Core.hs ‎src/Help/Ozil/Core.hs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{-# LANGUAGE UndecidableInstances #-}
22
{-# LANGUAGE TemplateHaskell #-}
33

4-
module Help.Ozil.App.Core
4+
module Help.Ozil.Core
55
(
66
-- Core app
77
OApp
@@ -27,10 +27,10 @@ import Commons hiding (to)
2727
import Help.Page
2828
(getNewSubcommand, highlightedSubcommand, LinkState, mkLinkStateOff, DocPage
2929
, displayHeading)
30-
import Help.Ozil.App.Config.Watch (WatchManager, FSEvent)
31-
import Help.Ozil.App.Config.Types
30+
import Help.Ozil.Config.Watch (WatchManager, FSEvent)
31+
import Help.Ozil.Config.Types
3232
(Config, HasKeyBindings (..), KeyBindings, userConfig)
33-
import Help.Ozil.App.Cmd (optCommand, Options, HasDebugMode(..), _Default)
33+
import Help.Ozil.Cmd (optCommand, Options, HasDebugMode(..), _Default)
3434

3535
import Brick (App (..))
3636
import Brick.BChan (BChan)

‎src/Help/Ozil/App/Death.hs ‎src/Help/Ozil/Death.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Help.Ozil.App.Death where
1+
module Help.Ozil.Death where
22

33
import Commons
44

‎src/Help/Ozil/App/KeyBinding.hs ‎src/Help/Ozil/KeyBinding.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{-# LANGUAGE DeriveAnyClass #-}
22

3-
module Help.Ozil.App.KeyBinding
3+
module Help.Ozil.KeyBinding
44
( Action (..)
55
, KeyBinding
66
, mkBinding

‎src/Help/Ozil/App/Startup.hs ‎src/Help/Ozil/Startup.hs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{-# LANGUAGE ViewPatterns #-}
22
{-# OPTIONS_GHC -Wno-unused-top-binds #-}
33

4-
module Help.Ozil.App.Startup
4+
module Help.Ozil.Startup
55
( finishStartup
66
) where
77

88
import Commons
99

1010
import Help.Page
11-
import Help.Ozil.App.Cmd
12-
import Help.Ozil.App.Death
13-
import Help.Ozil.App.Startup.Core
11+
import Help.Ozil.Cmd
12+
import Help.Ozil.Death
13+
import Help.Ozil.Startup.Core
1414

1515
import Help.Page.Lenses (name, section, shortDescription)
16-
import Help.Ozil.App.Config (getConfig, Config)
16+
import Help.Ozil.Config (getConfig, Config)
1717

18-
import qualified Help.Ozil.App.Config.Default as Default
18+
import qualified Help.Ozil.Config.Default as Default
1919

2020
import System.FilePath
2121

‎src/Help/Ozil/App/Startup/Core.hs ‎src/Help/Ozil/Startup/Core.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{-# LANGUAGE FunctionalDependencies #-}
44
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
55

6-
module Help.Ozil.App.Startup.Core
6+
module Help.Ozil.Startup.Core
77
(
88
-- Startup
99
Startup (..)
@@ -18,8 +18,8 @@ module Help.Ozil.App.Startup.Core
1818

1919
import Commons
2020

21-
import Help.Ozil.App.Config.Types (Config)
22-
import Help.Ozil.App.Cmd (Command, HasOptCommand (..), Options)
21+
import Help.Ozil.Config.Types (Config)
22+
import Help.Ozil.Cmd (Command, HasOptCommand (..), Options)
2323

2424
import Control.Monad.Reader (ask, MonadReader, ReaderT, runReaderT)
2525
import Data.IORef (newIORef, readIORef, modifyIORef, IORef)

‎src/Help/Page/Help.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module Help.Page.Help
1111

1212
import Commons
1313

14-
import Help.Ozil.App.Death (unreachableError)
14+
import Help.Ozil.Death (unreachableError)
1515

1616
import Brick (textWidth)
1717
import Control.Monad.State.Strict

0 commit comments

Comments
 (0)