diff options
| author | Fendor <power.walross@gmail.com> | 2021-02-03 19:12:02 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-03-28 17:26:37 -0400 |
| commit | 29d758631c0d9124485aafc89cddc4ec5a668653 (patch) | |
| tree | 72efc6ad23ddc052cecd01b493384b8fbc74daab /ghc/GHCi/UI | |
| parent | b02c8ef768df33ef4845da2f15583cf143a4d0e2 (diff) | |
| download | haskell-29d758631c0d9124485aafc89cddc4ec5a668653.tar.gz | |
Add UnitId to Target record
In the future, we want `HscEnv` to support multiple home units
at the same time. This means, that there will be 'Target's that do
not belong to the current 'HomeUnit'.
This is an API change without changing behaviour.
Update haddock submodule to incorporate API changes.
Diffstat (limited to 'ghc/GHCi/UI')
| -rw-r--r-- | ghc/GHCi/UI/Info.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ghc/GHCi/UI/Info.hs b/ghc/GHCi/UI/Info.hs index 144ebc4a78..db09243967 100644 --- a/ghc/GHCi/UI/Info.hs +++ b/ghc/GHCi/UI/Info.hs @@ -237,7 +237,7 @@ findType infos span0 string = do guessModule :: GhcMonad m => Map ModuleName ModInfo -> FilePath -> MaybeT m ModuleName guessModule infos fp = do - target <- lift $ guessTarget fp Nothing + target <- lift $ guessTarget fp Nothing Nothing case targetId target of TargetModule mn -> return mn TargetFile fp' _ -> guessModule' fp' @@ -248,7 +248,7 @@ guessModule infos fp = do Nothing -> do fp'' <- liftIO (makeRelativeToCurrentDirectory fp') - target' <- lift $ guessTarget fp'' Nothing + target' <- lift $ guessTarget fp'' Nothing Nothing case targetId target' of TargetModule mn -> return mn _ -> MaybeT . pure $ findModByFp fp'' |