mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid unneccessary Maybe

Browse source
This commit is contained in:
Joey Hess 2018-07-16 12:06:06 -04:00
parent d529e18460
commit d3f06ad112
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Annex/Url.hs
View file

@ -26,9 +26,9 @@ import Network.Socket
defaultUserAgent :: U.UserAgent defaultUserAgent :: U.UserAgent
defaultUserAgent = "git-annex/" ++ BuildInfo.packageversion defaultUserAgent = "git-annex/" ++ BuildInfo.packageversion
getUserAgent :: Annex (Maybe U.UserAgent) getUserAgent :: Annex U.UserAgent
getUserAgent = Annex.getState $ getUserAgent = Annex.getState $
Just . fromMaybe defaultUserAgent . Annex.useragent fromMaybe defaultUserAgent . Annex.useragent
getUrlOptions :: Annex U.UrlOptions getUrlOptions :: Annex U.UrlOptions
getUrlOptions = Annex.getState Annex.urloptions >>= \case getUrlOptions = Annex.getState Annex.urloptions >>= \case
@ -42,7 +42,7 @@ getUrlOptions = Annex.getState Annex.urloptions >>= \case
mk = do mk = do
(urldownloader, manager) <- checkallowedaddr (urldownloader, manager) <- checkallowedaddr
mkUrlOptions mkUrlOptions
<$> getUserAgent <$> (Just <$> getUserAgent)
<*> headers <*> headers
<*> pure urldownloader <*> pure urldownloader
<*> pure manager <*> pure manager