diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-11-15 16:55:38 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-11-15 16:59:32 -0400 |
| commit | 4888bd597e34dce996fd581bb417ce017099171b (patch) | |
| tree | 8b97f6807b5528be6b00c8d21038057ca097ec29 /Annex/FileMatcher.hs | |
| parent | 01c524779136a688abf312e721abce41d2dd109c (diff) | |
enable LambdaCase and convert around 10% of places that could use it
Needs ghc 7.6.1, so minimum base version increased slightly. All builds
are well above this version of ghc, and debian oldstable is as well.
Code that could use lambdacase can be found by running:
git grep -B 1 'case ' | less
and searching in less for "<-"
This commit was sponsored by andrea rota.
Diffstat (limited to 'Annex/FileMatcher.hs')
| -rw-r--r-- | Annex/FileMatcher.hs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Annex/FileMatcher.hs b/Annex/FileMatcher.hs index 1e07a9da2..722f2b33a 100644 --- a/Annex/FileMatcher.hs +++ b/Annex/FileMatcher.hs @@ -133,12 +133,10 @@ mkLargeFilesParser = do #ifdef WITH_MAGICMIME magicmime <- liftIO $ catchMaybeIO $ do m <- magicOpen [MagicMimeType] - liftIO $ do - md <- getEnv "GIT_ANNEX_DIR" - case md of - Nothing -> magicLoadDefault m - Just d -> magicLoad m - (d </> "magic" </> "magic.mgc") + liftIO $ getEnv "GIT_ANNEX_DIR" >>= \case + Nothing -> magicLoadDefault m + Just d -> magicLoad m + (d </> "magic" </> "magic.mgc") return m #endif let parse = parseToken $ commonTokens |