diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2015-05-13 09:51:49 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2015-05-13 09:51:49 +0100 |
| commit | a154944bf07b2e13175519bafebd5a03926bf105 (patch) | |
| tree | 6b242eb072fe0f9a68d84375f70f4a58044a8ddf | |
| parent | 5910a1bc8142b4e56a19abea104263d7bb5c5d3f (diff) | |
| download | haskell-a154944bf07b2e13175519bafebd5a03926bf105.tar.gz | |
Two wibbles to fix the build
...following the constraint-tuple patch.
* There was interaction with the recent Safe Haskell change
* Haddock comoplained about constraint tuples defined but not used
| -rw-r--r-- | compiler/typecheck/TcInteract.hs | 3 | ||||
| -rw-r--r-- | libraries/ghc-prim/GHC/Classes.hs | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/compiler/typecheck/TcInteract.hs b/compiler/typecheck/TcInteract.hs index ce51b0d796..603c127fa6 100644 --- a/compiler/typecheck/TcInteract.hs +++ b/compiler/typecheck/TcInteract.hs @@ -2026,7 +2026,8 @@ matchClassInst _ clas [ ty ] _ matchClassInst _ clas ts _ | isCTupleClass clas , let data_con = tyConSingleDataCon (classTyCon clas) - = return (GenInst ts (EvDFunApp (dataConWrapId data_con) ts)) + tuple_ev = EvDFunApp (dataConWrapId data_con) ts + = return (GenInst ts tuple_ev True) -- The dfun is the data constructor! matchClassInst _ clas [k,t] _ diff --git a/libraries/ghc-prim/GHC/Classes.hs b/libraries/ghc-prim/GHC/Classes.hs index 5a3e48e374..73ae69ebf1 100644 --- a/libraries/ghc-prim/GHC/Classes.hs +++ b/libraries/ghc-prim/GHC/Classes.hs @@ -6,7 +6,12 @@ -- ip :: IP x a => a is strictly speaking ambiguous, but IP is magic {-# OPTIONS_GHC -fno-warn-unused-imports #-} --- XXX -fno-warn-unused-imports needed for the GHC.Tuple import below. Sigh. +-- -fno-warn-unused-imports needed for the GHC.Tuple import below. Sigh. + +{-# OPTIONS_GHC -fno-warn-unused-top-binds #-} +-- -fno-warn-unused-top-binds is there (I hope) to stop Haddock complaining +-- about the constraint tuples being defined but not used + {-# OPTIONS_HADDOCK hide #-} ----------------------------------------------------------------------------- -- | |