Skip to content

Commit 31d4b2a

Browse files
committed
backward compat fixes
1 parent 2bf1a00 commit 31d4b2a

File tree

1 file changed

+17
-4
lines changed

1 file changed

+17
-4
lines changed

src/Configuration/Utils.hs

+17-4
Original file line numberDiff line numberDiff line change
@@ -280,19 +280,19 @@ programInfo
280280
-- ^ default configuration
281281
ProgramInfo a
282282
programInfo desc parser defaultConfig =
283-
programInfoValidate desc parser defaultConfig $ return
283+
programInfoValidate desc parser defaultConfig $ const (return ())
284284

285285
-- | Smart constructor for 'ProgramInfo'.
286286
--
287287
-- 'piHelpHeader' and 'piHelpFooter' are set to 'Nothing'.
288288
--
289-
programInfoValidate
289+
programInfoValidate'
290290
String
291291
MParser a
292292
a
293293
ConfigValidation' a f r
294294
ProgramInfoValidate' a f r
295-
programInfoValidate desc parser defaultConfig valFunc = ProgramInfo
295+
programInfoValidate' desc parser defaultConfig valFunc = ProgramInfo
296296
{ _piDescription = desc
297297
, _piHelpHeader = Nothing
298298
, _piHelpFooter = Nothing
@@ -302,6 +302,19 @@ programInfoValidate desc parser defaultConfig valFunc = ProgramInfo
302302
, _piConfigurationFiles = []
303303
}
304304

305+
-- | Smart constructor for 'ProgramInfo'.
306+
--
307+
-- 'piHelpHeader' and 'piHelpFooter' are set to 'Nothing'.
308+
--
309+
programInfoValidate
310+
String
311+
MParser a
312+
a
313+
ConfigValidation a f
314+
ProgramInfoValidate a f
315+
programInfoValidate desc parser defaultConfig valFunc =
316+
programInfoValidate' desc parser defaultConfig $ \c -> valFunc c >> return c
317+
305318
-- -------------------------------------------------------------------------- --
306319
-- AppConfiguration
307320

@@ -718,7 +731,7 @@ parseConfiguration
718731
)
719732
T.Text
720733
-- ^ program name (used in error messages)
721-
ProgramInfoValidate a f
734+
ProgramInfoValidate' a f r
722735
-- ^ program info value; use 'programInfo' to construct a value of this
723736
-- type
724737
[String]

0 commit comments

Comments
 (0)