diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-11-13 16:18:24 -0800 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-11-16 15:32:56 -0800 |
| commit | ac1a379363618a6f2f17fff65ce9129164b6ef30 (patch) | |
| tree | 65a0154fa86cf8dda560f62ecc6ae7555da65ac7 /utils/ghctags/Main.hs | |
| parent | 9193629a6d8c7605ba81e62bc7f9a04a8ce65013 (diff) | |
| download | haskell-ac1a379363618a6f2f17fff65ce9129164b6ef30.tar.gz | |
Revert "Unify hsig and hs-boot; add preliminary "hs-boot" merging."
Summary:
This reverts commit 06d46b1e4507e09eb2a7a04998a92610c8dc6277.
This also has a Haddock submodule update.
Test Plan: validate
Reviewers: simonpj, austin, bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1475
Diffstat (limited to 'utils/ghctags/Main.hs')
| -rw-r--r-- | utils/ghctags/Main.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/utils/ghctags/Main.hs b/utils/ghctags/Main.hs index 16b2e95e57..cfc795601d 100644 --- a/utils/ghctags/Main.hs +++ b/utils/ghctags/Main.hs @@ -224,9 +224,9 @@ fileTarget filename = Target (TargetFile filename Nothing) True Nothing graphData :: ModuleGraph -> (Maybe Handle, Maybe Handle) -> Ghc () graphData graph handles = do mapM_ foundthings graph - where foundthings ms - | Just filename <- msHsFilePath ms = - let modname = moduleName $ ms_mod ms + where foundthings ms = + let filename = msHsFilePath ms + modname = moduleName $ ms_mod ms in handleSourceError (\e -> do printException e liftIO $ exitWith (ExitFailure 1)) $ @@ -238,7 +238,6 @@ graphData graph handles = do liftIO (writeTagsData handles =<< fileData filename modname s) _otherwise -> liftIO $ exitWith (ExitFailure 1) - | otherwise = return () fileData :: FileName -> ModuleName -> RenamedSource -> IO FileData fileData filename modname (group, _imports, _lie, _doc) = do |