diff options
author | Alan Zimmerman <alan.zimm@gmail.com> | 2015-08-02 10:26:59 +0200 |
---|---|---|
committer | Alan Zimmerman <alan.zimm@gmail.com> | 2015-08-02 10:26:59 +0200 |
commit | 15dd7007275a5dcdae2c9f104773eceaa56590dc (patch) | |
tree | 9fe88a05942e8dc024e52d7f56830be3dae4899b /compiler/iface | |
parent | 75504f300d4db33ff66cc1a572d473bdb23b6a42 (diff) | |
download | haskell-15dd7007275a5dcdae2c9f104773eceaa56590dc.tar.gz |
Replace (SourceText,FastString) with StringLiteral data type
Summary:
Phab:D907 introduced SourceText for a number of data types, by replacing
FastString with (SourceText,FastString). Since this has an Outputable
instance, no warnings are generated when ppr is called on it, but
unexpected output is generated. See Phab:D1096 for an example of this.
Replace the (SourceText,FastString) tuples with a new data type,
```lang=hs
data StringLiteral = StringLiteral SourceText FastString
```
Update haddock submodule accordingly
Test Plan: ./validate
Reviewers: hvr, austin, rwbarton, trofi, bgamari
Reviewed By: trofi, bgamari
Subscribers: thomie, trofi, rwbarton, mpickering
Differential Revision: https://phabricator.haskell.org/D1101
GHC Trac Issues: #10692
Diffstat (limited to 'compiler/iface')
-rw-r--r-- | compiler/iface/MkIface.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/iface/MkIface.hs b/compiler/iface/MkIface.hs index 2b8a21272e..6771925094 100644 --- a/compiler/iface/MkIface.hs +++ b/compiler/iface/MkIface.hs @@ -1331,7 +1331,7 @@ checkDependencies hsc_env summary iface this_pkg = thisPackage (hsc_dflags hsc_env) dep_missing (L _ (ImportDecl { ideclName = L _ mod, ideclPkgQual = pkg })) = do - find_res <- liftIO $ findImportedModule hsc_env mod (fmap snd pkg) + find_res <- liftIO $ findImportedModule hsc_env mod (fmap sl_fs pkg) let reason = moduleNameString mod ++ " changed" case find_res of FoundModule h -> check_mod reason (fr_mod h) |