Skip to content

Commit 3a55954

Browse files
committed
no-op: ordering
1 parent e43085e commit 3a55954

7 files changed

Lines changed: 11 additions & 11 deletions

File tree

shellbit.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ library
2727
Shellbit.Version
2828
Shellbit.Column
2929
other-modules:
30-
Shellbit.Line
3130
Paths_shellbit
31+
Shellbit.Line
3232
build-depends:
3333
aeson >= 1.4 && < 1.5
3434
, ansi-wl-pprint >= 0.6 && < 0.7
@@ -96,9 +96,9 @@ test-suite shellbit-test
9696
, filepath
9797
, hspec
9898
, main-tester
99-
, shellbit
10099
, optparse-applicative
101100
, regex-tdfa
101+
, shellbit
102102
, temporary
103103
, text
104104
, typed-process

src/Shellbit/Main.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ module Shellbit.Main
44
) where
55

66
import Data.Version (showVersion)
7+
import Options.Applicative (briefDesc, execParser, info, infoOption, helper,
8+
hidden, short)
79
import Shellbit.Git (GitError(GitError))
810
import Shellbit.Nix (executeNixShell)
911
import Shellbit.Operation (Operation(ExecuteShell, ListVersions),
@@ -14,8 +16,6 @@ import Shellbit.PPrint (Doc, fatal, listItems, noProject, noVersion,
1416
noVersions, putDocLn, putVersionNotFound)
1517
import Shellbit.Project (unProject)
1618
import Shellbit.Version (unVersion)
17-
import Options.Applicative (briefDesc, execParser, info, infoOption, helper,
18-
hidden, short)
1919
import System.Exit (exitFailure)
2020
import UnliftIO.Exception (Handler(Handler), catches)
2121

src/Shellbit/Options.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ module Shellbit.Options
55
, options
66
) where
77

8-
import Shellbit.Project (Project(Project))
9-
import Shellbit.Version (Version(Version))
108
import Options.Applicative (Parser, action, flag', help, long, many,
119
metavar, short, strArgument, strOption)
10+
import Shellbit.Project (Project(Project))
11+
import Shellbit.Version (Version(Version))
1212

1313

1414
data Options = Options

src/Shellbit/Project.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ module Shellbit.Project
55
) where
66

77
import Data.List (sortOn)
8-
import Shellbit.Git (gitDiscoverRepo, gitRemoteGetUrl, gitRemoteList)
98
import Safe (headMay)
9+
import Shellbit.Git (gitDiscoverRepo, gitRemoteGetUrl, gitRemoteList)
1010
import System.Directory (getCurrentDirectory, getHomeDirectory)
1111
import System.FilePath (takeBaseName)
1212

test/Shellbit/OptionsSpec.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module Shellbit.OptionsSpec (spec) where
22

3+
import Options.Applicative (briefDesc, defaultPrefs, execParserPure,
4+
getParseResult, info)
35
import Shellbit.Options (Options(Options), Command(List), Arg(Arg), optArgs,
46
optCommand, optProject, optVersion, options)
57
import Shellbit.Project (Project(Project))
68
import Shellbit.Version (Version(Version))
7-
import Options.Applicative (briefDesc, defaultPrefs, execParserPure,
8-
getParseResult, info)
99
import Test.Hspec (Expectation, HasCallStack, Spec, context, describe,
1010
it, shouldBe)
1111

test/Shellbit/Sbox.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ module Shellbit.Sbox
1818
import Data.Foldable (traverse_)
1919
import Distribution.Simple.Utils (copyDirectoryRecursive)
2020
import Distribution.Verbosity (silent)
21-
import Shellbit.Git (git_)
2221
import Shellbit.Config (configInit)
22+
import Shellbit.Git (git_)
2323
import System.Directory (copyFile, createDirectory)
2424
import System.FilePath ((</>))
2525
import Test.Utils (silence, withEnv, withInput)

test/Shellbit/VersionSpec.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module Shellbit.VersionSpec (spec) where
22

3-
import Shellbit.Version (Version(Version), currentVersion, detectVersion)
43
import Shellbit.Sbox (fixturesPath, localProject)
4+
import Shellbit.Version (Version(Version), currentVersion, detectVersion)
55
import System.Directory (createDirectoryIfMissing, copyFile,
66
removeDirectoryRecursive, withCurrentDirectory)
77
import System.FilePath ((</>))

0 commit comments

Comments
 (0)