@@ -248,7 +248,7 @@ oneOfStrings' matches strs = try $ do
248248 let strs' = [xs | (x:xs) <- strs, x `matches` c]
249249 case strs' of
250250 [] -> fail "not found"
251− _ -> (c:) `fmap` oneOfStrings' matches strs'
251+ _ -> (c:) <$> oneOfStrings' matches strs'
252252 <|> if "" `elem` strs'
253253 then return [c]
254254 else fail "not found"
@@ -389,8 +389,8 @@ emailAddress :: Stream s m Char => ParserT s st m (String, String)
389389emailAddress = try $ toResult <$> mailbox <*> (char '@' *> domain)
390390 where toResult mbox dom = let full = fromEntities $ mbox ++ '@':dom
391391 in (full, escapeURI $ "mailto:" ++ full)
392− mailbox = intercalate "." `fmap` (emailWord `sepby1` dot)
393− domain = intercalate "." `fmap` (subdomain `sepby1` dot)
392+ mailbox = intercalate "." <$> (emailWord `sepby1` dot)
393+ domain = intercalate "." <$> (subdomain `sepby1` dot)
394394 dot = char '.'
395395 subdomain = many1 $ alphaNum <|> innerPunct
396396 innerPunct = try (satisfy (\c -> isEmailPunct c || c == '@') <*
@@ -453,7 +453,7 @@ uri = try $ do
453453 <|> entity
454454 <|> (try $ punct >>
455455 lookAhead (void (satisfy isWordChar) <|> percentEscaped))
456− str <- snd `fmap` withRaw (skipMany1 ( () <$
456+ str <- snd <$> withRaw (skipMany1 ( () <$
457457 (enclosed (char '(') (char ')') uriChunk
458458 <|> enclosed (char '{') (char '}') uriChunk
459459 <|> enclosed (char '[') (char ']') uriChunk)
@@ -895,7 +895,7 @@ class HasReaderOptions st where
895895 extractReaderOptions :: st -> ReaderOptions
896896 getOption :: (Stream s m t) => (ReaderOptions -> b) -> ParserT s st m b
897897 -- default
898− getOption f = (f . extractReaderOptions) `fmap` getState
898+ getOption f = (f . extractReaderOptions) <$> getState
899899
900900instance HasReaderOptions ParserState where
901901 extractReaderOptions = stateOptions
@@ -1016,7 +1016,7 @@ type SubstTable = M.Map Key Inlines
10161016registerHeader :: (Stream s m a, HasReaderOptions st, HasHeaderMap st, HasIdentifierList st)
10171017 => Attr -> Inlines -> ParserT s st m Attr
10181018registerHeader (ident,classes,kvs) header' = do
1019− ids <- extractIdentifierList `fmap` getState
1019+ ids <- extractIdentifierList <$> getState
10201020 exts <- getOption readerExtensions
10211021 let insert' = M.insertWith (\_new old -> old)
10221022 if null ident && Ext_auto_identifiers `Set.member` exts
@@ -1173,7 +1173,7 @@ nested :: Stream s m a
11731173 => ParserT s ParserState m a
11741174 -> ParserT s ParserState m a
11751175nested p = do
1176− nestlevel <- stateMaxNestingLevel `fmap` getState
1176+ nestlevel <- stateMaxNestingLevel <$> getState
11771177 guard $ nestlevel > 0
11781178 updateState $ \st -> st{ stateMaxNestingLevel = stateMaxNestingLevel st - 1 }
11791179 res <- p
@@ -1220,6 +1220,6 @@ applyMacros' :: Stream [Char] m Char
12201220applyMacros' target = do
12211221 apply <- getOption readerApplyMacros
12221222 if apply
1223− then do macros <- extractMacros `fmap` getState
1223+ then do macros <- extractMacros <$> getState
12241224 return $ applyMacros macros target
12251225 else return target