@@ -6,10 +6,10 @@ module Main (main) where
6
6
import Control.Applicative.Combinators
7
7
import qualified Control.Applicative.Combinators.NonEmpty as CNE
8
8
import Control.Monad
9
- import Data.Bitraversable
10
9
import Data.Monoid (Endo (.. ))
11
10
import qualified Options.Applicative as Opt
12
11
import qualified Options.Applicative.Help as Opt
12
+ import qualified Prettyprinter as PP
13
13
import qualified Text.Parsec as P
14
14
import qualified Text.Parsec.String as P
15
15
import qualified Distribution.Verbosity as V
@@ -153,21 +153,20 @@ globalParser = Opt.info (Opt.helper <*> parser) infoMod
153
153
. P. runParser verbosityString () " command line option"
154
154
155
155
err :: P. ParseError -> String
156
- err _ = ($ " " ) $ Opt. displayS $ Opt. renderCompact $ Opt. extractChunk $ Opt. vsepChunks
157
- [ Opt. stringChunk " Takes a number (0-3) or one of the following values:"
158
- , Opt. tabulate
159
- #if MIN_VERSION_optparse_applicative(0,17,0)
160
- (Opt. prefColumns Opt. defaultPrefs)
161
- #endif
162
- =<< traverse (bitraverse Opt. stringChunk Opt. stringChunk)
163
- [ (" silent" , " No output" )
164
- , (" normal" , " Default verbosity" )
165
- , (" verbose" , " Increased verbosity" )
166
- , (" deafening" , " Maximum verbosity" )
167
- ]
168
- ]
169
-
170
-
156
+ err _ = show $ PP. vsep
157
+ [ PP. pretty " Takes a number (0-3) or one of the following values:"
158
+ , PP. hsep
159
+ [ PP. vsep $ PP. pretty . (++ " :" ) . fst <$> verbs
160
+ , PP. vsep $ PP. pretty . snd <$> verbs
161
+ ]
162
+ ]
163
+
164
+ verbs =
165
+ [ (" silent" , " No output" )
166
+ , (" normal" , " Default verbosity" )
167
+ , (" verbose" , " Increased verbosity" )
168
+ , (" deafening" , " Maximum verbosity" )
169
+ ]
171
170
172
171
-----------------------------------------------------------------------
173
172
-- List
0 commit comments