Skip to content

Commit a93bb66

Browse files
committed
((>>) -> (*>))
1 parent 1cb1b40 commit a93bb66

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

main/Repl.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ main' iniVal = initState iniVal >>= \s -> flip evalStateT s
7979
(pure commandPrefix)
8080
(pure "paste")
8181
completion
82-
(rcFile >> greeter)
82+
(rcFile *> greeter)
8383
finalizer
8484
where
8585
commandPrefix = ':'

src/Nix/Parser.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ nixSym :: Parser NExprLoc
179179
nixSym = annotateLocation1 $ mkSymF <$> identifier
180180

181181
nixSynHole :: Parser NExprLoc
182-
nixSynHole = annotateLocation1 $ mkSynHoleF <$> (char '^' >> identifier)
182+
nixSynHole = annotateLocation1 $ mkSynHoleF <$> (char '^' *> identifier)
183183

184184
nixInt :: Parser NExprLoc
185185
nixInt = annotateLocation1 (mkIntF <$> integer <?> "integer")
@@ -357,7 +357,7 @@ argExpr = msum [atLeft, onlyname, atRight] <* symbol ":" where
357357
-- there's a valid URI parse here.
358358
onlyname =
359359
msum
360-
[ nixUri >> unexpected (Label ('v' NE.:| "alid uri"))
360+
[ nixUri *> unexpected (Label ('v' NE.:| "alid uri"))
361361
, Param <$> identifier
362362
]
363363

@@ -393,7 +393,7 @@ argExpr = msum [atLeft, onlyname, atRight] <* symbol ":" where
393393
-- Get an argument name and an optional default.
394394
pair <- liftM2 (,) identifier (optional $ question *> nixToplevelForm)
395395
-- Either return this, or attempt to get a comma and restart.
396-
option (acc <> [pair], False) $ comma >> go (acc <> [pair])
396+
option (acc <> [pair], False) $ comma *> go (acc <> [pair])
397397

398398
nixBinders :: Parser [Binding NExprLoc]
399399
nixBinders = (inherit <+> namedVar) `endBy` semi where

src/Nix/String.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ stringIgnoreContext (NixString s _) = s
155155

156156
-- | Get the contents of a 'NixString' and write its context into the resulting set.
157157
extractNixString :: Monad m => NixString -> WithStringContextT m Text
158-
extractNixString (NixString s c) = WithStringContextT $ tell c >> pure s
158+
extractNixString (NixString s c) = WithStringContextT $ tell c *> pure s
159159

160160

161161
-- ** Setters

src/Nix/Type/Infer.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ instance MonadTrans Solver where
603603
lift = Solver . lift . lift
604604

605605
instance Monad m => MonadError TypeError (Solver m) where
606-
throwError err = Solver $ lift (modify (err :)) >> mzero
606+
throwError err = Solver $ lift (modify (err :)) *> mzero
607607
catchError _ _ = error "This is never used"
608608

609609
runSolver :: Monad m => Solver m a -> m (Either [TypeError] [a])

0 commit comments

Comments
 (0)